assignment 2 prep
Merge branch 'master' of https://github.com/rcnewman/rcnewman-499