Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge pull request #1 from ciudadanointeligente/latest_blog_posts

calls and lists last 10 post from tumblr blog
Merge branch 'latest_blog_posts' into gh-pages
Merge branch 'master' into gh-pages
Directorio
Directorio.
Orden directores.
Arregla path de grid.js
Adding my description
Foto agustín y rodrigo
Estilo blog.
Merge pull request #5 from lfalvarez/lfalvarez_desc

Adding my description
added my description
Merge pull request #6 from rezzo/gh-pages

added my description
Fotos equipo.
Merge branch 'gh-pages' of https://github.com/ciudadanointeligente/ciudadanoi into gh-pages

Conflicts:
	_includes/equipo.html