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

Conflicts:
	GruppeWEB/webProsjektKosthold.php
	GruppeWEB/webProsjektStilark.css
Merge branch 'master' of https://github.com/Fredtrix/Workitout

Conflicts:
	GruppeWEB/webProsjektKosthold.php
	GruppeWEB/webProsjektStilark.css
Merge branch 'master' of https://github.com/Fredtrix/Workitout