Bugfix.
Merge branch 'master' of https://github.com/Agfct/fellesprosjekt_g18