test
Merge branch 'master' into jiaqing

Conflicts:
	Uno.sdf
genCard()
deleted space
合并了佳庆的 genCard 函数。 啪叽啪叽