added link to trip on the show marker page
Modified trip and user controllers to reflect markers and trips in json object for the show view, and started modifying js file to use the json object
More work on multiple markers
fixed multiple markers on a trip map