finalized finalized makefile
Merge branch 'master' of https://github.com/mmhoust/CPSC360Project3