change in web xml
solved conflict
login servlet completely working, using sessions, etc. Also implemented logout which kills the session and redirects to login screen
Merge branch 'master' of https://github.com/ibarreto/image-sharing-system

Conflicts:
	WEB-INF/web.xml