fixed Makefile run
Merge branch 'master' of https://github.com/CSCD-540/project