updated Makefile
Merge https://github.com/pb376/cs4411-p5
fixed more bugs