Updated README
merged with gh-pages branch