new stuff
Merge branch 'master' of github.com:jameycribbs/game_manager