setrdh
Merge branch 'master' of https://github.com/jnysteen/FoersteAarsProjekt-V3.git

Conflicts:
	testresults.txt