Makefile and setup
Fixing README.md conflict