Progresando con el informe Lottery Scheduling
Merge branch 'master' of https://github.com/lvuotto/so-tps

Conflicts:
	tp1/informe/informe.tex