Map class updated
Merge pull request #13 from mikejuyoon/justin-working

Map class updated