Create gh-pages branch via GitHub
fixed merge conflict
Merge branch 'master' into gh-pages
markdown
markdown
fixed misconfigurations
test page