Modified README and fixed Makefile
resolved conflict