stash
merging
Adding polylines to the map
merge
Merge pull request #17 from KeirOsborn/master

before pushing to heroku
draft
fixed a bug in the google map api library code
merge
Merge remote-tracking branch 'nicky/dev' into dev
added polylines for multiple journeys
Merge branch 'current_master' into dev
added multiple colors to polylines
Merge pull request #18 from raven-valentine/master

added poly line
Merge pull request #19 from hoongman/current_master

added multiple journey polylines
first commit
polyline moving arrows added
Merge branch 'polylines' into current_master
Merge pull request #20 from hoongman/current_master

added moving arrows to polyline
sorted out the merge conflicts in the places
some styling issues on thetrips/new page