2013-06-16 2215
Merge branch 'gh-pages' of https://github.com/xguse/movingthelamppost into gh-pages

Conflicts:
	blog/doctrees/environment.pickle
2013-06-16 2221