latest map changes
Merge branch 'sprint2' of https://github.com/eliw00d/Paris into sprint2