Added code from assignments 1, 2, and 3.
Merge branch 'master' of https://github.com/ahfergus1/cs3388