B1
G1
G2
G3
Merge remote-tracking branch 'actividad2.4/rama3' into rama3

Conflicts:
	rama3.html