added some stuff
some changes
Merge branch 'master' of https://github.com/dmst-sweng/git-intro

Conflicts:
	bin/ExcitingStory.class