Re-read it this morning and fixed errors I made yesterday.

Everything is still from memory, so no promises.
Edit A
Edit B
Merge branch 'conflict-1' into conflict-2

Conflicts:
	candy.txt