f
Merge branch 'master' of https://github.com/nmizuki/AlienBuster

Conflicts:
	canvas.html
	game.html