bla bla
Merge branch 'develop' of https://github.com/fernandacoto/IATProyectoTEC into develop

Conflicts:
	ITCR.IntegrateAlTrabajo/ITCR.IntegrateAlTrabajo.suo