Merge branch '_collapse' into develop
Merge branch '_collapse' into develop
Merge branch 'master' into develop
Arreglado responsive de "Escuela y Enlaces"
Merge remote-tracking branch 'origin/develop' into Comentarios

Conflicts:
	style.css
Merge branch 'Comentarios' into develop
Merge branch 'develop'