Foobar nlin test addnewfile 2

This time I want to merge into origin/master from my local, not like last time at the remote.