Adding files to gh-pages
update readme
fix merge conflicts