work computer commit
Pre Challenge Attempt Chapter 5 Complete
Merge branch 'master' of ssh://git@github.com/bpb824/geoquiz.git

Conflicts:
	GeoQuiz/bin/GeoQuiz.apk