(gitignore commit)

.gitignore

@@ -1,46 +1,43 @@
-# Android Studio
-*.iml
-.idea
-/.idea/workspace.xml
-/.idea/libraries
-
-# Gradle files
 .gradle
-/build
-
-# Local configuration file (sdk path, etc)
 /local.properties
-
-
-# NDK
-obj/
-
-# OSX files
+/.idea/workspace.xml
 .DS_Store
-
-# Android Studio captures folder
-/captures
-
-# External native build folder generated in Android Studio 2.2 and later
-.externalNativeBuild
-
+/build
 # built application files
 *.apk
 *.ap_
 
-# Windows thumbnail db
-Thumbs.db
+# files for the dex VM
+*.dex
+
+# Java class files
+*.class
+.DS_Store
 
 # generated files
 bin/
 gen/
-out/
+Wiki/
 
-# keystore
-/app/keystore
-*.jks
-/keystore.properties
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Eclipse project files
+.classpath
+.project
+.settings/
+
+# Proguard folder generated by Eclipse
+proguard/
+
+#Android Studio
+build/
+
+# Intellij project files
+*.iml
+*.ipr
+*.iws
+.idea/
 
-# tinyPic
-/app/tinypic_compressed_list.txt
-/app/tinypic_white_list.txt
+#gradle
+.gradle/