Merge branch 'gh-pages' of https://github.com/FPurchess/poow into gh-pages
made it work on olis laptop
Merge branch 'gh-pages' of https://github.com/FPurchess/poow into gh-pages

Conflicts:
	public/js/game.js
enemy spawning every few seconds
player movement
Merge branch 'gh-pages' of github.com:olilo/poow into gh-pages

Conflicts:
	app/components/enemy.js
	public/js/game.js
	public/js/game.js.map