Merge branch 'develop' of https://github.com/JayK31/cycle-smart into develop
added clear and show options for citibike, bike shops, and accidents
fixed merge conflicts in user show html page and map.js
fixed merge conflicts in gemfile