updated everything
Merge pull request #44 from torijule/map

updated everything