fixed index.html merge problems from setting up gh-pages