Mapmarkers

Added map markers and merged with Logan's tab branch