updates
Merge branch 'master' of github.com:chrisochs/game_machine
updates