adding nice features to my super nice branch
test
Merge branch 'morten-branch' into ninatullebranch
Merge branch 'henrikSinBranch' into ninatullebranch
Merge branch 'paals-branch' into ninatullebranch
Merge branch 'ninatullebranch'