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
updated goal index page
updated footer to work properly on all pages
Fixed background image
Merge pull request #73 from nathantross/layoutcleanup

Layoutcleanup
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
added no turbolinks to nav
recompiled assets also'
added add button to goals show page
Merge pull request #74 from nathantross/javascript

added add button to goals show page
Updated Goals New Page
fixed merge problem