1024 整合
Merge pull request #5 from piercalex/master

1023joe修改部分
Merge branch 'master' of https://github.com/chuyu123/m 冲突

Conflicts:
	act/respon/assets local/sass/fruit.scss
	act/respon/assets/css.css
	act/respon/assets/css.css.map
Revert "Merge pull request #31 from chuyu123/master"

This reverts commit 37a592101989d7a647df405c29fc44e485301cc9, reversing
changes made to c6440a015d565e6395ef0d6c6f6f440a53737b67.

Conflicts:
	css/landingpage2.css
	pg-cx.html
	pg-price.html
Merge pull request #32 from chuyu123/master

1024  冲突啊~~~~(>_<)~~~~