teste
Merge remote-tracking branch 'origin/master'

Conflicts:
	projetoGit/src/projetoGit/GitHub.java