still project2, but more  progress
Merge branch 'master' of github.com:jeremydane/Info3180-Project3