trying to fix heroku issue
update root
solve merge conflict
 go us
Merge branch 'connecting' of https://github.com/morganwildermuth/RidersForHealth into solutions
Merge pull request #5 from morganwildermuth/solutions

Solutions