finish!
Merge branch 'client' of https://github.com/lihaoda/FinalPro into client