Late evening commit
Merge branch 'master' of https://github.com/vimlock/game