Div endringer
jhfhcjcjhv
Merge branch 'master' of https://github.com/Temestokles/gruppeweb

Conflicts:
	index_innhold.php
	uteliv.php
Merge branch 'master' of https://github.com/Temestokles/gruppeweb