Evaluacion
Eliminando temporales
Merge branch 'master' of https://github.com/jatempa/tests_programming

Conflicts:
	Test.py