first commit
Merge branch 'master' of https://github.com/KTH-ID2212/exercise5

Conflicts:
	.gitignore