ultima versao
ultima versao 2
a ver se é desta
Merge branch 'master' of https://github.com/xmchammerx/tp2

* 'master' of https://github.com/xmchammerx/tp2:
  ola
  AiVai Nelson :)

Conflicts:
	iso
	iso.o
	iso_last.c