grunt-sync
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages

* upstream/gh-pages:
  grunt-sync
Auto-connect livereload
Intermediate commit
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages

* upstream/gh-pages:
  Auto-connect livereload

Conflicts:
	_includes/scripts.html
	_views/_includes/scripts.html
Initial designs
Some revision
Tweaks
About
Language
basedir
Intermediate commit
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages

* upstream/gh-pages:
  basedir
bugfix
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages

* upstream/gh-pages:
  bugfix
Jade-liquid
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages

* upstream/gh-pages:
  Jade-liquid

Conflicts:
	_layouts/default.html
	_layouts/post.html
	_views/_includes/liquid.jade
	_views/_layouts/default.jade
	_views/_layouts/post.jade
	_views/index.jade
	index.html
Intermediate commit
sorted_categories
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages

* upstream/gh-pages:
  sorted_categories