Site updated at 2014-01-07 15:57:46 UTC
replace missing files and get things back in order!
add rakefile for publishing
Merge branch 'master' into gh-pages

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