first commit
commit juguang
Merge branch 'master' of github.com:baijiezi/juguang into gh-pages

Conflicts:
	index.html