Mark the README as a Markdown file.
Merge branch 'master' into future