first
Merge branch 'master' of https://github.com/petterhj/inf1060

merge