merged conflicts in db, about to do mailer
changing email settings
trying to get this branch up-to-date with my mailer feature without messing up devise views
fixing mailing feature
fixing .js file for mailer
fixed mailer and devise views aren't affected
d
adding closing body tag
Merge pull request #12 from Joshua-Pearson/fixing_mailer_feature

Fixing mailer feature