jogo e treino
novojogo
Merge remote-tracking branch 'origin/teste' into teste

Conflicts:
	build/web/WEB-INF/classes/com/dai/dao/CompeticaoDaoImpl.class
	build/web/WEB-INF/classes/com/dai/dao/JogoDaoImpl.class
	build/web/WEB-INF/classes/com/dai/dao/TreinoDaoImpl.class
	build/web/WEB-INF/classes/com/dai/jdbc/JogoExtractor.class