Merge branch 'gh-pages'
Merge branch 'gh-pages'
.gitignore
restructure conditional code
cname
cname
Merge branch 'master' into gh-pages