changed comment
Merge branch 'master' of https://github.com/nicksheffield/Node-chat

Conflicts:
	public/assets/css/style.styl
Merge branch 'master' of https://github.com/nicksheffield/Node-chat