Octopress init
Site updated at 2014-09-22 18:36:11 UTC
Merge branch 'master' of https://github.com/magic2k/magic2k.github.io

Conflicts:
	atom.xml
	blog/2014/09/18/options-parser/index.html
	blog/archives/index.html
	blog/categories/example/atom.xml
	blog/categories/moo/atom.xml
	blog/categories/note/atom.xml
	blog/categories/note/index.html
	blog/categories/rails/atom.xml
	blog/categories/rails/index.html
	blog/categories/ruby/atom.xml
	index.html
	sitemap.xml
	stylesheets/screen.css
Site updated at 2014-09-22 18:39:49 UTC