updates action mailer
Merge branch 'master' of https://github.com/nathantross/project2
Merge branch 'master' of https://github.com/nathantross/project2
resolves conflicts
resolves conflicts
Merge branch 'master' of https://github.com/nathantross/project2
Merge branch 'master' of https://github.com/nathantross/project2
Merge branch 'master' of https://github.com/nathantross/project2
creates model for wolfram alpha api query and adds custom validators
fixing merge conflicts
Merge branch 'master' of https://github.com/nathantross/project2