Bugfix
Merge branch 'master' of https://github.com/Sokrad/2DDungeonCrawlerHTML5

Conflicts:
	game.js