Removed the link to readme.html since I put the README.md on GitHub
Merging locally