updated the makefile and combined our code into one file for turn in. We still need to go through and clean up the comments and unused functions