ee
t
test
delete psd
Merge branch 'gh-pages' of github.com:baijiezi/juguang into gh-pages

Conflicts:
	images/banner.jpg
	index.html
change index
sdf
ee
change 简介
change email
add products.html,productDetail.html
product
Merge branch 'gh-pages' of github.com:baijiezi/juguang into gh-pages

Conflicts:
	index.html