Implemented part of functions.
Merge branch 'master' of https://github.com/nfischer/CS111Lab1
Fixing build errors from the merge