fix the bug
Merge remote-tracking branch 'LOU/master'

Conflicts:
	WebApp/war/WEB-INF/web.xml
signup
login
sign Up
SignUp page
Merge remote-tracking branch 'mike/master'
try to recovery pics
Merge branch 'master' of git@github.com:tenznhok/Group320.git
sign up page email
Merge remote-tracking branch 'mike/master'
signOut
id sign up edit info view
logInView
status
user infoooooo
Merge remote-tracking branch 'LOU/master'

Conflicts:
	Persistence/src/edu/ycp/cs320/awesomepage/server/model/persist/FakeDatabase.java
adda
info
userStatus in FakeDatabase