Finished the assignment (hopefully), added makefile