Descripción condiciones mínimas
Merge branch 'gh-pages' of https://github.com/mediafranca/fundamentos into gh-pages

Conflicts:
	css/mf.css
	less/custom.less
	less/slides.less
	pags/presentacion.md
Componentes y plantillas

Descripción de los componentes y plantillas para insertar los modelos
Merge branch 'gh-pages' into hspencer

Conflicts:
	css/mf.css
	less/custom.less