Kåmitte såm master
Merge branch 'master' of https://github.com/Fredtrix/Workitout

Conflicts:
	GruppeWEB/webProsjektStilark.css
	GruppeWEB/webProsjektTopp.php
fiks
fiksifisksdadsaaas
asadasdasd
Merge branch 'master' of https://github.com/Fredtrix/Workitout