articulo
Merge branch 'master' of https://github.com/proyectodah/cerebro

Conflicts:
	index.html