Switch README.md for README.rdoc
Merge commit