Project 3 Final Commit
Merge branch 'master' of https://github.com/khaynie/cpsc360
Project 4 PRogress