implement feature X
implement feature Y
improve feature X
Merge branch 'feature-y'
add an exclamation mark
use a better smiley
Merge branch 'conflicting-branch'

Conflicts:
	README

We took the easy way out and unified the smiley and the exclamation mark.
B