Final commit. Fixes loose ends.
Merge branch 'master' of https://github.com/theluigi/CS344-Project1