bringing up to date
Merge branch 'master' of https://github.com/mylesonine/game