Saved current state in "backup" branch.  Master will be used for the final in-class version, but any "real" features we want can go in backup.
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md