Commit før merge
Igen :/
Merge remote-tracking branch 'origin/master'