added trip marker and centered around trip
fixed conflicts
Merge pull request #65 from arieldiamond/map_revisions

Map revisions