commit
Merge branch 'master' of https://github.com/jml88/tsi206
Merge branch 'master' of https://github.com/jml88/tsi206.git
commit
Merge branch 'master' of https://github.com/jml88/tsi206

Conflicts:
	jatrick/web_jatrik/src/comunicacion/Comunicacion.java
Integracion