Updated Makefile
Merging stuff
Updated makefile