kadakakdakdakadasdksadasdkasdkakdasä
Merge branch 'master' of https://github.com/Fredtrix/Workitout

Conflicts:
	GruppeWEB/index.php
	GruppeWEB/webProsjektinnhold.php