resolving conflicts'
Merge branch 'master' of https://github.com/nathantross/project2
resolves conflicts
resolves conflicts
heroku fiddling
heroku tinkering again attempting to fix asset compilation
precompilation again for heroku
serving static assets true again
removed assets folder to check production
generated action mailer
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
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'
commented out fitgem and graph methods, donut still not routing properly
donut and area graphs working