Local Changes

commit needed to be made to sync
Merge branch 'master' of https://github.com/jakestambaugh/CS401