<NME> .gitignore
<BEF> # built application files
*.apk
*.ap_

# files for the dex VM
*.dex

# Java class files
*.class

# generated files
bin/
gen/

# Local configuration file (sdk path, etc)
local.properties

# Eclipse project files
.classpath
.project
build

# Stupid MAC
.DS_STORE

# gradle
.gradle

<MSG> Updated .gitignore to include IntelliJ elements.
<DFF> @@ -12,9 +12,19 @@
 bin/
 gen/
 
+
 # Local configuration file (sdk path, etc)
 local.properties
 
 # Eclipse project files
 .classpath
 .project
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Intellij project files
+*.iml
+*.ipr
+*.iws
+.idea/

{'addition_count': 10, 'commit_subject': 'Updated .gitignore to include IntelliJ elements.', 'deletion_count': 0, 'file_extension': '', 'lang': 'gitignore', 'license': 'mit', 'repo_name': 'jd-alexander/Google-Directions-Android'}