Pre-merge commit
Merge branch 'master' of https://github.com/khreenberg/scrum-intro-tiebreak.git
Removes duplicate folders