Makefile for part 4
Added all of our names to the authors makefile
Let's fix this
fixed merging issue
fixed merging issue