Octopress init
Site updated at 2014-02-06 10:48:34 UTC
Merge branch 'master' of github.com:williamdemeo/williamdemeo.github.io

Conflicts:
	atom.xml
	blog/archives/index.html
	blog/categories/notes/atom.xml
	blog/categories/notes/index.html
	blog/index.html
	index.html
	js/jquery-1.8.2.min.js
	sitemap.xml
	stylesheets/screen.css
Site updated at 2014-02-06 10:53:37 UTC