more web work
Merge branch 'master' of https://github.com/ethancallen/flog

Conflicts:
	project.clj
	src/flog/core.clj