a
Merge branch 'master' of https://github.com/zhangluoma0614/dbproject.git

Conflicts:
	TinyFacebook/WebContent/userInfo.jsp
Merge branch 'master' of https://github.com/zhangluoma0614/dbproject.git

Conflicts:
	TinyFacebook/WebContent/userInfo.jsp
Merge branch 'master' of https://github.com/zhangluoma0614/dbproject.git
sss