Merge remote-tracking branch 'LOU/master'

Conflicts:
	WebApp/src/edu/ycp/cs320/awesomepage/client/logInView.java
q
Merge remote-tracking branch 'LOU/master'
Merge remote-tracking branch 'LOU/master'

Conflicts:
	WebApp/war/WEB-INF/web.xml
signup
sign Up
SignUp page
Merge remote-tracking branch 'mike/master'