update index.html
modificando index.html
update title
modificando oncecolumn.html
quito una s
Merge pull request #2 from diemateOptiva/features/f2

Oye integra mi rama, se llama features/f2
Merge pull request #1 from gmillan/features/guada

pull request
Merge remote-tracking branch 'alfonso/master' into features/berta2

Conflicts:
	index.html