I'm figuring this out...
Merge branch 'master' of https://github.com/wibbs/memorize

Conflicts:
	progress.txt