clojure-contrib-master for clojure 1.6.1
Merge branch 'master' of github.com:fovtran/compojure116

Conflicts:
	README.md