Initial commit
Merge branch 'master' of https://github.com/KTH-ID2212/exercise3

Conflicts:
	pom.xml