Gir beskjed hvem som er sjefen
Merge branch 'master' of https://github.com/magnushs/firstRepo

Conflicts:
	studburst.txt
Merge branch 'master' of https://github.com/magnushs/firstRepo