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

Conflicts:
	src/business/C.java
	src/business/StartGame.java
	src/scene/SceneGame.java