working on extracting the json to a file so we can easily add stuff
Merge branch 'master' of https://github.com/uShip/uShip-The-Game
hooked up the buttons to ScoreKeeper
Merge branch 'master' of https://github.com/uShip/uShip-The-Game