En Aramis Branch
Comente la primera linea
Editado en alfonso
Merge remote-tracking branch 'origin/alfonso' into aramis
Merge remote-tracking branch 'origin/aramis'

Conflicts:
	readme.txt