Fixed makefile for submission

The makefile we submit actually needs to look like this. (which was
modified from the supplied one to include our extra .c files)