Teste

Eu
Merge branch 'master' of https://github.com/rogBordignon/LeagueOfObjectOriented

Conflicts:
	LeagueOfObjectOriented/Jogador.h
Merge branch 'master' of https://github.com/rogBordignon/LeagueOfObjectOriented