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

Conflicts:
	images/banner.jpg
	index.html