Cleaner button code allows for easier button addition; game state code reflects
Merge branch 'ryan's-branch' of https://github.com/MissionBit/SnailAssalt
.