actualizado
Merge branch 'master' of https://github.com/abr4xas/pelican-simplegrey
Merge branch 'master' of https://github.com/abr4xas/pelican-simplegrey
Merge branch 'master' of https://github.com/abr4xas/pelican-simplegrey
Merge branch 'master' of https://github.com/abr4xas/pelican-simplegrey
Merge branch 'master' of https://github.com/abr4xas/pelican-simplegrey

Conflicts:
	templates/index.html
modificado
actualizado