Merge pull request chentao0707#28 from SkillCollege/pr/27

Pr/27

Author: chentao0707

.gitignore

@@ -1,25 +1,44 @@
-# Built application files
-*.apk
-*.ap_
+# Android generated
+bin
+gen
+lint.xml
 
-# Files for the Dalvik VM
-*.dex
+# IntelliJ IDEA
+.idea
+*.iml
+*.ipr
+*.iws
+classes
+gen-external-apklibs
 
-# Java class files
-*.class
+# Eclipse
+.project
+.classpath
+.settings
+.checkstyle
 
-# Generated files
-bin/
-gen/
+# Gradle
+.gradle
+build
+out
 
-# Gradle files
-.gradle/
-build/
-/*/build/
+# Maven
+target
+release.properties
+pom.xml.*
 
-# Local configuration file (sdk path, etc)
+# Ant
+ant.properties
 local.properties
+proguard.cfg
+proguard-project.txt
 
+<<<<<<< HEAD
+# Other
+.DS_Store
+dist
+tmp
+=======
 # Proguard folder generated by Eclipse
 proguard/
 
@@ -65,3 +84,4 @@ proguard-project.txt
 .DS_Store
 dist
 tmp
+>>>>>>> master