tryout
Merge branch 'master' of https://github.com/AkoyaP6618/RPG.git

Conflicts:
	src/com/sebastian/wolff/rpg/DialogManager.java