Initial commit
start
nu skifter vi
Merge branch 'nanibranch'
Merge branch 'master' into nanibranch