Initial merge of map to master
commit DS Store
commit DS Store
updated ignore file