mapView make it rain + intro
Merged conflicts resolved