Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/my_4clojure_solutions/p026.clj
Merge branch 'master' of https://github.com/gdeer81/my-4clojure-solutions

Conflicts:
	src/my_4clojure_solutions/p026.clj