different api key for maps
gitignore
Merge branch 'master' of https://github.com/carter213/cse190

Conflicts:
	Grubber/AndroidManifest.xml
	Grubber/bin/AndroidManifest.xml
removing files