gh-page
Updated Readme
fixed merge issue from gh-pages branch