para bajar
Merge branch 'master' of https://github.com/npcastro/Tarea-SO

Conflicts:
	llamadas.txt
Merge branch 'master' of https://github.com/npcastro/Tarea-SO
Con metodo para meter si corresponde