404 page chagned
Merge branch 'chat_timers' of github.com:originalblend337/chat_app into ranking_users_in_chatroom
Ranking box created but not styled yet
added css styling wip
Merge remote-tracking branch 'origin/ranking_users_in_chatroom' into development

Conflicts:
	app/assets/javascripts/chatrooms.js
	app/assets/stylesheets/chatrooms.css.scss
	app/controllers/chatrooms_controller.rb
	app/controllers/messages_controller.rb
	app/views/chatrooms/_search.html.erb
	app/views/chatrooms/show.html.erb