Testing
Merge branch 'master' of https://github.com/Sunspar/eecs4413c

Conflicts:
	WebContent/WEB-INF/web.xml