SI: Execicio 6 acabado
Merge branch 'master' of https://github.com/pepipe/ISEL

Conflicts:
	.gitignore