comentario
minuto a minuto sin terminar
Merge branch 'master' of https://github.com/jml88/tsi206.git

Conflicts:
	jatrick/logica_jatrik/ejbModule/partidos/PartidoControlador.java
Merge branch 'master' of https://github.com/jml88/tsi206

Conflicts:
	jatrick/logica_jatrik/ejbModule/interfaces/IPartidoControlador.java
va