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
refactoring controller for email
removed typhoeus gem
added join table and adjusted model relationships
adjusted model relationships
refactored flight controller and made 4 workers, only 3 functioning so far
Merge pull request #13 from jadeapplegate/update_models

Update models
adding jade's updates
refactored flight controller and made 4 workers, only 3 functioning so far
changing README
bahl;d
Merge pull request #14 from Joshua-Pearson/5_27_feature

5 27 feature