Update README.md

asdf added
Merge upstream, fix README conflict.