asdasd
Merge branch 'master' of github.com:throoze/coloquio

Conflicts:
	compartido.txt
arreglo
Merge branch 'master' of github.com:throoze/coloquio

Conflicts:
	compartido.txt