Octopress init
Site updated at 2014-09-19 06:08:00 UTC
Site updated at 2014-09-19 06:10:39 UTC
Merge branch 'master' of github.com:juliangarcia/juliangarcia.github.com

Conflicts:
	atom.xml
	blog/2013/06/21/hello/index.html
	blog/archives/index.html
	blog/index.html
	cv/index.html
	index.html
	other/index.html
	publications/index.html
	research/index.html
	sitemap.xml
	software/index.html
	stylesheets/screen.css
	teaching/index.html
Site updated at 2014-09-19 06:13:42 UTC