modify some bug
Merge branch 'Farewell' of https://github.com/Hubertzhang/Asteriated-Grail into Farewell

Conflicts:
	cardList.h