no message
Merge branch 'master' of https://github.com/tmgarcia/RichAnimationFinal
no message
Merge branch 'master' of https://github.com/tmgarcia/RichAnimationFinal

Conflicts:
	game.js