arreglado todos los errores de edilson
Merge branch 'master' of https://github.com/ricardo210/laboratorio7

Conflicts:
	lab_7.pro.user
Merge branch 'master' of https://github.com/ricardo210/laboratorio7