change
merge
..
..
..
..
Merge branch 'hqs' of https://github.com/Hubertzhang/Asteriated-Grail into hqs
finish server
add character blademaster
text program(doesn't finish)
finish text program
blademaster finish
berserker and archer
new
new2
??
finish sealer and assassin
Merge branch 'network' into hqs
chat system added
Merge branch 'hqs' into Hubert

Conflicts:
	Asteriated-Grail.pro
	blademaster.cpp
	blademaster.h
	cardList.cpp
	cardList.h
	cardpile.cpp
	cardpile.h
	main.cpp
	player.cpp
	player.h
	server.cpp
	server.h
	team.cpp
	team.h