test

test
prueba2

PUREBA2
Merge remote-tracking branch 'origin/master' into Cursos

Conflicts:
	src/main/java/pe/edu/cibertec/gch/dao/FactoryDao.java