shuman
Merge remote-tracking branch 'origin/man'

Conflicts:
	cse135/WebContent/SignUp.jsp
	cse135/src/user/UserData.java