test
Merge branch 'master' of https://github.com/Gosipov/Project.git

Conflicts:
	Inquizition/src/servlets/LoginRetry.java
	Inquizition/src/servlets/SignUpRetry.java