Minor changes for homework passoff.
Merge branch 'dev' of https://github.com/jslinker/CS340 into dev