Panic commit
Merge branch 'master' of
https://github.com/khreenberg/scrum-intro-tiebreak.git

Conflicts:
	scrum-intro-tiebreak/src/test/TestClass.java