a gazillion's commit to pull the latest from git
Merge branch 'master' of https://github.com/elenam/intro-clojure-materials
A gazillion's commit because of a merge

Conflicts:
	overview_paper2013/overview_paper.tex