ejercicio 8
Merge
Merge branch 'master' of https://github.com/lucianodato/pds-2014

Conflicts:
	Guia 1/ejer_7.m