Octopress init
Site updated at 2013-08-22 18:52:34 UTC
Merge branch 'master' into gh-pages

Conflicts:
	2013/add-achievement-badges-to-your-gem-readme/index.html
	2013/how-to-run-thor-tasks-from-your-ruby-scripts/index.html
	about/index.html
	atom.xml
	blog/archives/index.html
	blog/categories/analytics/atom.xml
	blog/categories/analytics/index.html
	blog/categories/badges/atom.xml
	blog/categories/badges/index.html
	blog/categories/debug/atom.xml
	blog/categories/gem-creation/atom.xml
	blog/categories/gem-newgem/atom.xml
	blog/categories/gem/atom.xml
	blog/categories/gem/index.html
	blog/categories/inheritance/atom.xml
	blog/categories/javascript/atom.xml
	blog/categories/json/atom.xml
	blog/categories/jsonp/atom.xml
	blog/categories/mixins/atom.xml
	blog/categories/rspec/atom.xml
	blog/categories/ruby/atom.xml
	blog/categories/ruby/index.html
	blog/categories/rubygems/atom.xml
	blog/categories/thor/atom.xml
	blog/categories/twitter-anonymous-client/atom.xml
	blog/categories/twitter/atom.xml
	blog/categories/yard/atom.xml
	index.html
	sitemap.xml
	stylesheets/screen.css