Final merge of game loop functions.
Merge branch 'master' of https://github.com/alvinlao/charm