This line is a summary

This is where we put longer descriptions. Seriously,
make these meaningful. People need to read them to
understand what changed.
Merge branch 'master' into add-diamond-sparkles

Conflicts:
	diamonds
Merge pull request #4 from kitschysynq/add-diamond-sparkles

This line is a summary