add android files to gitignore
Add Linux temp files to gitignore
Modified to run in Android Studio on 2.3.3
Rename Atlanta references to Philly.
Merge remote-tracking branch 'upstream/master'