hay vamos chido
hay vamos chido
Merge branch 'master' of https://github.com/brass3a4/AsignacionCuadratica

Conflicts:
	beatriz.pyc
	efrenFile.pyc
	libj.pyc
	mimi.pyc
camara seniores