Merge pull request #24 from chuyu123/master

1016导购机
Merge remote-tracking branch 'origin/master'

Conflicts:
	act/respon/assets local/sass/global.scss
	act/respon/assets local/sass/main.scss
	act/respon/assets/css.css
	act/respon/assets/css.css.map
1016五点半汇总
Merge pull request #10 from piercalex/master

1016 5:30