Added myself to README.md
merge conflicts