Merge branch 'improve_conversation_notifications' of github.com:elm-city-craftworks/practicing-ruby-web
Merge branch 'archives' of github.com:elm-city-craftworks/practicing-ruby-web
Merge branch 'master' of github.com:elm-city-craftworks/practicing-ruby-web