now you can search, if you want
fix merge issues
now you can search, if you want
fix conflicts
fixes conflicts

Conflicts:
	app/assets/javascripts/map.js