merge on linux
Merge git://github.com/bysjjl/bysj

Conflicts:
	about.html