Merge pull request #2 from MikeFot/android-studio-refactoring

Android studio refactoring

Author: MikeFot

.classpath

@@ -1,23 +1,49 @@
-# Built application files
+*.iml
+.gradle
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/build
+/captures
+
+# built application files
 *.apk
 *.ap_
 
-# Files for the Dalvik VM
+# files for the dex VM
 *.dex
 
 # Java class files
 *.class
 
-# Generated files
+# generated files
+.idea
+.gradle
+*~
 bin/
 gen/
-
-# Gradle files
-.gradle/
 build/
+target/
+app/build/
+/*/out
+
+*.iml
+*.iws
+*.ipr
+
 
 # Local configuration file (sdk path, etc)
 local.properties
 
-# Proguard folder generated by Eclipse
-proguard/
+# Eclipse project files
+.classpath
+.project
+.settings
+
+# Mac
+.DS_Store
+
+# Ruby history file
+.irb-history
+