uh-oh

Collision?
Merge branch 'master' into cookies

Resolved by combining both suggestions and covering in peanut butter as a
compromise.

Conflicts:
	chocolate-chip.md