Update for github pages
Bug fix: github pages uses different root dir
Merge branch 'gh-pages'

* gh-pages:
  Bug fix: github pages uses different root dir
  Update for github pages
Merge branch 'master' of github.com:ZedThree/merlot-theme-jekyll

* 'master' of github.com:ZedThree/merlot-theme-jekyll:
  Bug fix: github pages uses different root dir
  Update for github pages

Conflicts:
	_config.yml
Bug fix: forgot closing quotes in post title