缩略图
Merge branch 'master' of https://github.com/HowToLove/HiTrip

Conflicts:
	assets/HiTrip.html
	assets/map.html