user profile displays on connect, needs to display during chat
Merge branch 'master' of github.com:MsRomilaB/Just-Decide

Conflicts:
	app/controllers/users_controller.rb