finished 2, made broken program for 3
Merge branch 'master' of github.com:devlinjunker/CS472