Cambio el nombre a fourcolumn
Modificado menu de index
Merge remote-tracking branch 'alfonso/master' into features/berta2

Conflicts:
	index.html
Merge pull request #3 from blerin/features/berta2

pull request