all the GUI stuff
Merge branch 'master' of https://github.com/tog000/appathon_athena.git

Conflicts:
	src/com/athena/broncobattle/MainActivity.java