test 3
Merge branch 'master' of https://github.com/guigarage/HTML5-Game

Conflicts:
	missile.html