init repo
add new
add new 2
add new branch
test
test 5
test 6
test
Merge remote-tracking branch 'gitapp/master'