Revised cat.clj
Merge branch 'master' of github.com:clojurecup2014/astrocats

Conflicts:
	src/clj/astrocats/cats.clj