Create gh-pages branch via GitHub
Merge remote-tracking branch 'origin/gh-pages'

Conflicts:
	index.html
Merge branch 'master' of https://github.com/tomoyashibata/scss-shibata-sample