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
Testing Heroku Images
Merge pull request #105 from nathantross/errorfix

Testing Heroku Images
edited index page and added seeds
spaces
Merge pull request #106 from amandragon/miles

edited index page and added seeds
fixing navbar icon
more image testing
Merge branch 'master' of https://github.com/nathantross/project2
Merge pull request #107 from nathantross/test

more image testing
creates model for wolfram alpha api query and adds custom validators
precompiled assets
fixing merge conflicts