Aviam si m'en recordo
Merge branch 'master' into Segona_branca
Merge branch 'Segona_branca'

Conflicts:
	README3.txt