hej
Merge branch 'master' of https://github.com/FredrikBergelin/ProjektG29

Conflicts:
	.DS_Store