UTF-8-test
Merge branch 'master' of https://github.com/kennethfinnesand/is107-gruppe13-bteam

Conflicts:
bygg.php
Merge branch 'master' of https://github.com/kennethfinnesand/is107-gruppe13-bteam

Conflicts:
	bygg.php