hallo
Merge branch 'gh-pages' of https://github.com/BjornBjarnsteins/RogueLife into gh-pages

Conflicts:
	Character.js
	RogueLife.js
	entityManager.js
	index.html
drog ad platform sen hann virkar ekki thar sem thad a eftir ad setja inn spatial manager