resolving conflicts'
Merge branch 'master' of https://github.com/nathantross/project2
resolves conflicts
resolves conflicts
generated action mailer
Merge branch 'master' of https://github.com/nathantross/project2
Merge branch 'master' of https://github.com/nathantross/project2
updates styling
cleans up routes and adds contact route
incorporates action mailer and adds contact us functionality
Merge branch 'master' of https://github.com/nathantross/project2
resolves conflicts
updates action mailer to resolve conflcits
removes params.inspect
Merge pull request #78 from AmyWeiner/action_mailer_update

Action mailer update