Deleted README.md from local repo
Conflicts removed
Merge pull request #3 from olitreadwell/README_edit

Readme deleted on local repo

Hope I didn't mess this up.