reset og error
Merge branch 'master' of https://github.com/Nichiatu/web1000-innlevering2