All features but extra done
all features but extra done
Merge branch 'master' of
https://github.com/firstdown77/assignment5-webapplication

Conflicts:
	src/servlets/DatabaseMethods.java