added the map
changed map
Merge branch 'master' into megan2