Using syntax highlighting
Baz!
More commits to readme
Updating commands for branch commits
Generating a conflict pre-merge
Merge branch 'master' into feature

Conflicts:
	baz