comentario
Merge remote-tracking branch 'origin/master'
obs
teste
Merge branch 'master' of https://github.com/GlaucoMoraes/LeagueOfObjectOriented

Conflicts:
	LeagueOfObjectOriented/Arma.m
Merge branch 'master' of https://github.com/GlaucoMoraes/LeagueOfObjectOriented