“initial commit”
Merge branch 'map-views'
merge map-view branch
updated git ignore file