resolve redirect
Merge branch 'master' of https://github.com/DorisLee/WEat

Conflicts:
	WEat/src/java/edu/pitt/Login/LoginServlet.java
resolve conflict
Add group resolve
Delete workSpaceServlet.java
Merge branch 'master' of https://github.com/DorisLee/WEat

Conflicts:
	WEat/nbproject/genfiles.properties
	WEat/nbproject/project.properties
	WEat/src/java/edu/pitt/Login/AddGroup.java
	WEat/src/java/edu/pitt/Login/LoginServlet.java
	WEat/src/java/edu/pitt/domain/Group.java
	WEat/web/group.jsp