new version
Merge branch 'master' of https://github.com/hallow/Hovedprosjekt