Working version but not passing autograder
Submitted
Merge branch 'master' of https://github.com/leommoore/CS188P1