add cljs
Merge branch 'master' of github.com:dmarjenburgh/swag

Conflicts:
	project.clj
	src/swag/server.clj