Resolve merge conflicts
Resolve merge conflicts
Merge branch 'master' of github.com:elm-city-craftworks/practicing-ruby-web into delayed_broadcast_mailer