Octopress init
Site updated at 2014-05-03 19:58:03 UTC
Site updated at 2014-05-03 19:58:23 UTC
Merge branch 'master' of github.com:magnusp/magnusp.github.com

Conflicts:
	atom.xml
	blog/archives/index.html
	index.html
	javascripts/github.js
	javascripts/modernizr-2.0.js
	javascripts/octopress.js
	javascripts/pinboard.js
	javascripts/twitter.js
	sitemap.xml
	stylesheets/screen.css
Site updated at 2014-05-03 20:04:05 UTC