Final post-CS Fair push

Nothing's really changed here except any tweaks made during the CS Fair
and making sure the spec document is up-to-date. Didn't want you to
grade based on an old Git Commit.
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.php
	schema.sql
	spec.docx