update
Merge pull request #30 from chenlihua/master

页面调整及修改（图片添加）
Merge branch 'master' of https://github.com/Joyguo0/magento1810
Merge pull request #31 from chenlihua/master

样式修改与图片添加
Merge branch 'master' of https://github.com/Joyguo0/magento1810
git clean
Merge branch 'master' of https://github.com/Joyguo0/magento1810

Conflicts:
	app/design/frontend/default/se101/template/catalog/category/view.phtml
css.css的修改