updated README.md and Makefile
attempt to merge
attempting to fix merge issue
Merge pull request #47 from snordt/master

updated README.md and Makefile