changed routes
merge conflict
added puma as server
changed mailer settings
Merge branch 'master' of https://github.com/evagabriela/techwomen-ComingSoonPage