Merge pull request #301 from jshou/patch-1

* patch-1:
  add intellij files to Android.gitignore

Android.gitignore

@@ -20,4 +20,11 @@ local.properties
 .project
 
 # Proguard folder generated by Eclipse
-proguard/
+proguard/
+
+# Intellij project files
+*.iml
+*.ipr
+*.iws
+.idea/
+