Added the map feature

Fixed the problem of the marker getting hidden in 2s and the problem
with scrolling.
Merge pull request #2 from ShreyasSinha/map

Added the map feature