Initial repository setup.
Uploaded from my web browser
Uploaded from my web browser
Uploaded from my web browser
Merge branch 'master' of http://debian7-64-web-cat.local:8080/webcat/WebObjects/Web-CAT.woa/git/User/avellaneda.root

Conflicts:
	.gitignore
	PR-Correccion-array/.classpath
Borrado lo que sobraba
Un fallo apost
Merge branch 'master' of https://github.com/alvarogonzalezsotillo/programacion-1daw