Final Changes
merge conflicts
Merge branch 'master' of https://github.com/lachana/database-systems.git

Conflicts:
	FinalProject2610/WebContent/WEB-INF/web.xml
Hopefully things work
Merge branch 'master' of https://github.com/lachana/database-systems.git

Conflicts:
	FinalProject2610/WebContent/WEB-INF/web.xml