fixed conficts
Merge pull request #3 from econchick/map

Fixed map to render