Merge branch 'master' of https://github.com/lopossumi/invaders

Conflicts:
	invaders.js
	monster.js
resolving