- enemyList removed
- (very simple) fights added
Merge branch 'master' of https://github.com/DavidPfander/dungeon
- merged
Merge branch 'master' of https://github.com/DavidPfander/dungeon

Conflicts:
	Dungeon/src/main.lua
	Dungeon/src/maps.lua