main
conventions
Merge branch 'master' of https://github.com/fmonpelat/TP4-Algoritmos-1

Conflicts:
	tareas.c