1.
Merge branch 'AlexTest'
Merge branch 'master' of https://github.com/guigarage/HTML5-Game