Fixing .gitnore .iml issues. No need to track .iml. Changing build.gradle to SDK 19 instead of 20.
Delete app.iml

Deleting THIS. OOOPS.
Merge remote-tracking branch 'origin/master'
Fixed .gitignore. Fixed build.gradle. Removed app.iml.