Update README.md

Added myself
fix merge conflicts