edit gitignore
Merge branch 'master' of github.com:syamagen/android_gps
edit gitignore