elimina log
Merge branch 'master' of
https://github.com/edalac2003/ProyectoIntegradorI_2014-2.git

Conflicts:
	Microcurriculo2/log_PI1.log
Merge branch 'master' of https://github.com/edalac2003/ProyectoIntegradorI_2014-2.git
Vistas