initial page commit to gh-pages
fixed merge issues