undid changes to gametimes;
Merge branch 'master' of github.com:nodeGame/ultimatum