vert i nyavtale
Merge branch 'master' of https://github.com/EirikZimmerWold/Fellesprosjekt