More work in the integration thingie.
Merge branch 'master' of github.com:cegekanocturne/godgame