Update README.md
merging master to gh-pages