Added README
Edited README
added new feature
another feature added
another new new feature
master updated
feature branch conflict
conflict resolved. merged
Merge remote-tracking branch 'origin/master'
commit message
renamed README to README.md
fetched and merged
merged new Merge branch 'newBranch'