Added file2
added some text
Merge branch 'test1'
doing this with --no-ff