organizando
Merge branch 'master' of https://github.com/mrivaldojr/DispMoveisGrupo2

Conflicts:
	myPersonalTrainer/src/main/java/ufba/mypersonaltrainner/util/TreinosAtivos.java