404 page chagned
more differences
starting wireframes
Merge branch 'development' of github.com:originalblend337/chat_app into development
Merge branch 'chat_timers' of github.com:originalblend337/chat_app into ranking_users_in_chatroom
showing recent rooms and user account page
comments added and search function working as it should
more comments, refactor
changed s3 bucket name to env keys
changed hardcode to env var
changed method to get avatar
icons/placeholders adding
resolved mc: user_show
placeholder images added
stuff
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
resolving MC
start chatting