Revert "conflito"

This reverts commit c263d2b59f25556e74ed4471530d48d63d198f03.

Conflicts:

	lab1/README.txt