subida de logo
Merge branch 'master' of https://github.com/cesarcortes19/tesis-talleres into Integracion

Conflicts:
	src/main/webapp/pages/taller/administrador/crearTaller.jsp
	src/main/webapp/pages/taller/administrador/editarTaller.jsp
	src/main/webapp/pages/usuario/crearUsuario.jsp