lagt til henrik
Merge branch 'master' of github.com:iterate/sommergit
Merge remote-tracking branch 'origin/master'