backup commit
Merge branch 'master' of github.com:NomadGameStudio/awesomegame
merge