Eddited gh-pages text
Resolved conflicts