Updated working Makefile after deadline