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

Conflicts:
	GruppeWEB/webProsjektHoved.php
	GruppeWEB/webProsjektStilark.css