added markers on map and new functionality
Merge branch 'master' of https://github.com/gregory-hasyn/cityrep