added gh-pages
resolved git conflicts