Quest and a few fixes
Merge branch 'master' of https://github.com/propra13-orga/gruppe41

Conflicts:
	src/dungeonCrawler/GameElements/Enemy.java
	src/dungeonCrawler/GameElements/Player.java
	src/dungeonCrawler/GameLogic.java