commit week 1
Create gh-pages branch via GitHub
change index
add master source
merge conflict