Nuevo glosario de termos
		Merge branch 'master' of github.com:tuxtor/tuxtor.github.io

Conflicts:
	_site/blog/conceitos-basicos-gr/index.html
	_site/blog/o-blog-do-pinguim/index.html
	_site/feed.xml
	_site/index.html