a basic web socket page
Merge branch 'master' of https://github.com/mattoraptor/galah

Conflicts:
	project.clj