Merge branch 'master' of https://github.com/mickkn/E2PRJ2GRP1

Conflicts:
	Projektrapport/Master.pdf