jekyll update
update jekyll
Site updated at 2014-01-07 16:02:34 UTC
add plugins
fix sass
fix something that deleted all my files!
Site updated at 2014-01-07 16:12:34 UTC
Merge branch 'master' into gh-pages

Conflicts:
	_config.yml
	_layouts/post.html
	index.html
	jekyll/update/2014/01/05/back-home/index.html