added lasers!
Merge branch 'master' of https://github.com/ingisg/html5-game

Conflicts:
	app/styles/main.scss