Replace master branch with page content via GitHub
Update index
fix merge conflict