inital commit baby
my second commit
:q
add new file
add third file
Merge branch 'test'
Merge remote branch 'origin/master'