Copied all Ole's code into Master branch. Did not use git merge, just copying.
Merge branch 'master' of https://github.com/jonatanl/fellesprosjekt