Change file 1
Added file 3 to master
Merge remote-tracking branch 'origin/master' into file2changing