Fix
Merge branch 'master' of github.com:hans/hans.github.com

Conflicts:
	_posts/2013-04-17-programming-clojure.md