authentication attempt
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/vankhulup/web/BasicServlet.java