end of semester commit
Merge branch 'master' of http://github.com/wwaller/CS314-Honors