Game controller
Merge branch 'master' of github.com:CodeTiburon/erudite