Fixed a minor bug
Commit, got the buttons working on the tactical map
Merge branch 'master' of https://github.com/zdeveloper/HackABunchOfStuff
into Kevin

Conflicts:
	HackAThon/res/layout/activity_main.xml
Merge branch 'Kevin' of https://github.com/zdeveloper/HackABunchOfStuff

Conflicts:
	HackAThon/src/com/example/hackathon/CustomMapActivity.java