Accepting incoming changes??
One last acceptance for good measure
Minor cosmetic changes to the route.erb file and to the walk/drive toggle
Resolving merge issues
Merge branch 'thealaj-master'
Merge branch 'master' of https://github.com/kizzle102/EffErrands