?
Merge branch 'master' of https://github.com/ajcummins/CS496Project.git

Conflicts:
	CS496_Project_Webservice/src/edu/ycp/cs496/eduapp/webapp/servlets/Login.java