updated Makefile
Merge github.com:HyveMynd/cs3505-Final-Project