man ekki. ekkert mikilvægt
Merge branch 'gh-pages' of https://github.com/BjornBjarnsteins/RogueLife into gh-pages
Merge branch 'gh-pages' of https://github.com/BjornBjarnsteins/RogueLife into gh-pages

Conflicts:
	Dungeon.js
Merge branch 'gh-pages' of https://github.com/BjornBjarnsteins/RogueLife into gh-pages
Merge branch 'gh-pages' of https://github.com/BjornBjarnsteins/RogueLife into gh-pages
reyna að debugga
Merge branch 'gh-pages' of https://github.com/BjornBjarnsteins/RogueLife into gh-pages
Merge branch 'gh-pages' of https://github.com/BjornBjarnsteins/RogueLife into gh-pages
sword animation debug
Merge branch 'gh-pages' of https://github.com/BjornBjarnsteins/RogueLife into gh-pages