Octopress init
Site updated at 2014-01-06 13:31:48 UTC
Merge branch 'master' of github.com:jhotta/jhotta.github.com

Conflicts:
	atom.xml
	blog/2013/11/13/lean-ux-seminar/index.html
	blog/2013/11/18/trema-day-4/index.html
	blog/2014/01/06/engineer-english-1/index.html
	blog/archives/index.html
	blog/categories/english/atom.xml
	blog/categories/english/index.html
	blog/categories/floodlight/atom.xml
	blog/categories/floodlight/index.html
	blog/categories/lean/atom.xml
	blog/categories/lean/index.html
	blog/categories/ryu/atom.xml
	blog/categories/ryu/index.html
	blog/categories/sdn/atom.xml
	blog/categories/sdn/index.html
	blog/categories/semina/atom.xml
	blog/categories/semina/index.html
	blog/categories/trema/atom.xml
	blog/categories/trema/index.html
	blog/categories/ux/atom.xml
	blog/categories/ux/index.html
	index.html
	sitemap.xml
	stylesheets/screen.css
Site updated at 2014-01-06 13:56:35 UTC