Octopress init
Site updated at 2013-09-29 18:55:28 UTC
Merge branch 'master' of https://github.com/MasterBratac/masterbratac.github.io

Conflicts:
	blog/categories/blogging/atom.xml
	blog/categories/blogging/index.html
	blog/categories/octopress/atom.xml
	blog/categories/octopress/index.html
	blog/categories/puppet/atom.xml
	blog/categories/puppet/index.html
	blog/categories/ruby/atom.xml
	blog/categories/ruby/index.html
	blog/categories/sysadmin/atom.xml
	blog/categories/sysadmin/index.html
	sitemap.xml
	stylesheets/screen.css
Site updated at 2013-09-29 19:00:13 UTC