new file:   add_good.css
	new file:   add_good.html
	new file:   add_role.html
	new file:   add_website.html
	new file:   employee_list.html
	new file:   good1.png
	new file:   good_list.css
	new file:   good_list.html
	new file:   index.css
	new file:   fancyshop.komodoproject
	modified:   index.css
	modified:   index.html
	modified:   index.html
	new file:   custs.html
	modified:   custs.html
	modified:   index.html
	modified:   index.html
	new file:   setopentime.html
	new file:   tempc.html
	new file:   temweixin.html
	删除:         index.html~
	新文件:       README.md
Merge branch 'master' of github.com:simontaosim/fancyshopmodel

 请输入一个提交信息以解释此合并的必要性，尤其是将一个更新后的上游分支
 合并到主题分支。