renamed a couple of items from gameframe
Merge branch 'master' of https://github.com/sudopunk/game-boilerplate