Merge branch 'develop'
Merge branch 'master' of https://github.com/JayK31/cycle-smart into develop
css
fixed add route form
Merge branch 'develop' of https://github.com/JayK31/cycle-smart into develop
fixed add route form
fix typos in map.js
fix merge conflict in gemfile
fixing travis
changed version of ruby in travis yml file
on the way to clickable routes
on the way to clickable routes
tips work
Merge branch 'develop' of github.com:JayK31/cycle-smart into develop
precompiled for heroku
added render routes to map functionality
adding icons to heroku
Merge branch 'develop' of https://github.com/JayK31/cycle-smart into develop
adding asset_path to marker icons for heroku
markers should show