足迹+景点盖章！啊哈哈哈
Merge branch 'master' of https://github.com/HowToLove/HiTrip

Conflicts:
	assets/map.html