Fixed all the things.
Merge branch 'master' of https://github.com/jcambre/cs247-2104-p3