Grabbing Makefile from main
Updating the Makefile appropriately
Fixed includes
Merge pull request #1 from ayshih/alex

Makefile changes