Integrated map and flask
Commiting arnav's changes