debugged the map
Merge pull request #37 from kyledaugherty/merge-conflict-debugging

debugged the map