moved some lines
Merge branch 'master' of github.com:aleksanb/fellesprosjektet