delete line
once should remove the conflict after this
Merge branch 'master' of https://github.com/DreamProgrammer/CurrySampo

Conflicts:
	js/map.js