Solarized
Merge branch 'testing'
Merge branch 'master' of https://github.com/grierson/grierson.github.io

Conflicts:
	_posts/2014-05-29-001-pe.md
	_posts/2014-05-29-002-pe.md