Problem 130
Merge branch 'master' of github.com:eigenhombre/probs4clojure

Conflicts:
	docs/uberdoc.html