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