Updating clientID google
gitignore update
gitignore
Merge branch 'master' of https://github.com/colaborativa/huertofuensanta.org

Conflicts:
	_site/agradecimientos/index.html
Merge branch 'master' into gh-pages
Updating ClientID for OAuth2.0
Merge branch 'master' into gh-pages
Fix bug at template path
Merge branch 'master' into gh-pages
Merge branch 'gh-pages' of https://github.com/colaborativa/huertofuensanta.org into gh-pages