Some stuff.
Merge branch 'master' of github.com:pat-thomas/sandbox

Conflicts:
	ws-sandbox/project.clj
	ws-sandbox/public/js/main.js