fixes
Merge branch 'master' of github.com:pointeplusplus/CSCI-6140_Project