A semi-final round of changes for 4
Merge branch 'master' of https://github.com/elenam/intro-clojure-materials

Conflicts:
	overview_paper2013/overview_paper.tex