no message
Merge branch 'master' of https://github.com/wanze/GameDevProject

Conflicts:
	src/gamedev/quests/QuestPassCanyon.java