Bla
Merge branch 'master' of https://github.com/bennySwiers/exercise7

Conflicts:
	pom.xml