diff --git a/.gitignore b/.gitignore
index c6cbe56..0a3c1a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,52 @@
+# Built application files
+*.apk
+*.ap_
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+.gradle/
+build/
+
+
+# Built application files
+/*/build/
+
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# Intellij
 *.iml
-.gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
 .DS_Store
-/build
 /captures
+
+# Keystore files
+*.jks
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+
+.idea/
+app/build/
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 0c013ab..af33d55 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,8 +5,6 @@
       <module fileurl="file://$PROJECT_DIR$/.idea/FireCrasher.iml" filepath="$PROJECT_DIR$/.idea/FireCrasher.iml" />
       <module fileurl="file://$PROJECT_DIR$/FireCrasher.iml" filepath="$PROJECT_DIR$/FireCrasher.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/firecrasher/firecrasher.iml" filepath="$PROJECT_DIR$/firecrasher/firecrasher.iml" />
       <module fileurl="file://$PROJECT_DIR$/firecrasher/firecrasher.iml" filepath="$PROJECT_DIR$/firecrasher/firecrasher.iml" />
     </modules>
   </component>