push friend
Merge branch 'client' of https://github.com/lihaoda/FinalPro into client

Conflicts:
	LetSay/src/view/CardFriendPage.java