Quest-NPC hinzugefuegt
Merge branch 'master' of https://github.com/propra13-orga/gruppe44

Conflicts:
	res/maps/map01_02.txt