made a file.
added second file to master
Merge branch 'branch1'
Merge remote-tracking branch 'origin'