update
Merge branch 'master' of github.com:jeffknupp/blog

Conflicts:
	in_progress/hardest_revisited.md