Improved structure and added a bit of story.
Merge branch 'master' of https://github.com/dmst-sweng/git-intro

Conflicts:
	ExcitingStory.java