Merge branch 'AleM' of https://github.com/Deuce9001/servicio2020 into AleM

Conflicts:
	servicio2/src/java/Login.java