first attempt
Merge branch 'master' of github.com:CSC-3320-Fall/Assignment-7