SI: Ex 6 a bombar

Precisa de ser limado
Merge branch 'master' of https://github.com/pepipe/ISEL

Conflicts:
	.gitignore