aa
borrando gitignore
Merge branch 'master' of https://github.com/jjsebasv/Probanding.git

Conflicts:
	Cajeta/.classpath
	Cajeta/src/Cliente.java