Last one, Ferran
Merge https://github.com/olivellaf/gestioAlumnes

Conflicts:
	src/DOCUMENTACIO/disseny_uml.zargo
	src/DOCUMENTACIO/disseny_uml.zargo~