almost ready to use
Merge branch 'master' of github.com:kerbyfc/slag

Conflicts:
	src/slag/web.clj