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

Conflicts:
	src/ExcitingStory.java

Signed-off-by: GeorgeBazz <g.bazz@hol.gr>