Guevos culeros!!!
Merge origin/master

Conflicts:
	src/main/java/com/jc/elementos/model/ControladorUsuario.java
	src/main/webapp/guevos.html