first commit
new line added
the third line
new file2
changed file2
added a line in i
conflict resolved
Merge branch 'master' of github.com:guicampo/try_git