egg change already
Merge branch 'master' of https://github.com/wellsun/open into wanyuansheng

Conflicts:
	egg.c