Merge remote-tracking branch 'chavaone/gh-pages' into revealjs
Mais transpas
Merge remote-tracking branch 'ssice/gh-pages' into gh-pages

Conflicts:
	index.html