hej
Merge branch 'master' of https://github.com/rodde177/TestProjekt

Conflicts:
	rodde.php
mergead