This line is a summary$
$
This is where longer, lovely, meaningful descriptions go.
Merge pull request #6 from Sophi/my-new-feature

This line is a summary
Merge branch 'master' into add-diamond-sparkles

Conflicts:
	diamonds