fixing compile errors
Merge branch 'master' of https://github.com/pointeplusplus/CSCI-6140_Project