merge

Hej Bjorn. Go' ide at merge nu!