very first new branch
change
weflkdsf
Merge branch 'classfe'

Conflicts:
	fix.txt - Made a union of both approches
sdfdf
ew234234
Merge branch 'master' into classfe

Conflicts:
	fix.txt - cambioo todo el texto pcomo ejemplo