Merge branch 'master' of https://github.com/Mobirama/Truuuuco-

Conflicts:
Truuuuco!/Jogador.h
Merge branch 'master' of https://github.com/Mobirama/Truuuuco-

Conflicts:
	Truuuuco!/Jogador.h