Dá erro bro
Merge branch 'master' of https://github.com/1110242JoaoCunha/ex1git

Conflicts:
	Estudo eapli.txt

Signed-off-by: 1110230RuiMonteiro <1110230@isep.ipp.pt>
rtyr