Apagei a linha "Git"
Merge branch 'master' of https://github.com/1110476FilipeAlves/ex1git

Conflicts:
	sdfdsf.txt