Nuevo carlosguerrero.com funcional stage1 con mapas
Merge branch 'master' of https://github.com/guerrerocarlos/carlosguerrero.com

Conflicts:
	_posts/2014-01-01-Festival-SC-2013.md