incomplete fix
Merge branch 'master' of github.com:danchoi/geogossip

Conflicts:
	public/js/chatui.js