Conflicto1
Conflicto2
Merge branch 'quienessomos'

Conflicts:
	index.html
Merge branch 'contacto'