merge
merge sucesso
Merge branch 'master' of https://github.com/hiroakilucas/ProjetoGit

Conflicts:
	projetoGit/src/projetoGit/GitHub.java