Merge branch 'hw2-redo' of https://github.com/sun-j/cs-projects into hw2-redo

Rolled back to when it still worked. Will work forwards by copy-pasta
code as functionality is tested.
Merge branch 'hw2-redo' of https://github.com/sun-j/cs-projects into hw2-redo