Master 1 commit
First commit from branch 2
Commit two from branch 2
Commit 2 from master
added new files to branch repository
Merge branch 'branch2'
Merge remote-tracking branch 'remotes/origin/master'