Updated makefile
Merge branch 'master' of https://github.com/dbeckwith/cs3516_prog3