updated sprint 2
Merge branch 'master' of https://github.com/MattNewbill/android_combat_game