Re-implement changes in the AppHelper
Merge pull request #1 from raghav1987/App_Helper_Redo

Re-implement changes in the AppHelper
add map to show page
remove station spec test
fix merge conflicts
Finish working version of 4 coordinate points
Remove puts statement
Merge pull request #2 from DineshRai/render_map_on_show

add map to show page
Merge branch 'master' into App_Helper_Redo
Merge pull request #3 from raghav1987/App_Helper_Redo

App helper redo
Update README.md
Re-arrange show.html.erb
Merge branch 'master' of https://github.com/cicadas-2014/CitiRide-x
add routing functionality with js, can now find routes between start-first staion, stations, and second-station to destination
Merge pull request #4 from ksin/rearrange_show_html

Rearrange show html
fix merge conflict
fix ajax response
Merge pull request #5 from DineshRai/incorporate_coordinates_into_map

add routing functionality with js, can now find routes between start-fir...
hide bike route markers
Merge branch 'master' into change_markers