resolve conflict
Merge branch 'master' of github.com:JeffCost/gridmap

Conflicts:
	config/settings.php
	views/frontend/partials/maptile.blade.php