Automatic push
Merge branch 'master' of https://github.com/dwblair/dwblair.github.com

Conflicts:
	posts/2013-1-4-temp-markstein.html