chatroom display
Merge branch 'master' of github.com:gabac/chatty

Conflicts:
	public/javascripts/chat.js