updated project.clj
Merge branch 'master' of https://github.com/phiat/hotbits-clj

Conflicts:
	project.clj