Niklas commit 1 without push
Niklas commit 2 without push
Merge remote-tracking branch 'origin/master'