Endret noe
Merge branch 'master' of https://github.com/lindkjop/swaggruppe12
Merge branch 'master' of https://github.com/lindkjop/swaggruppe12

Conflicts:
	kulestfila