Collision Detection works!
Merge branch 'master' of
https://github.com/hs-furtwangen/NarrativeGame.git

Conflicts:
	src/core/WorldObj.java