Update README.md

Greeley's info
Merging
Fixed merge conflicts