Commit desde detached head
Merge commit 'f1e66ee1'
Index en features/f4
Index en features/f5
Nuevo commit para conflicto
Merge branch 'master' into features/f5

Conflicts:
	index.html