Updated Makefile

Updated Makefile and merge READMEs