Plain text README.
Resolve merge conflicts...