V1.1
V1.2更新
Merge branch 'master' of github.com:JasinYip/helpmechoose

Conflicts:
	css/style.css
	index.html
	js/main.js