resolvendo o conflito
Merge branch 'gh-pages' of https://github.com/eulersantana/CG into gh-pages

Conflicts:
	victor/trabalho2/t2.html
	victor/trabalho2/t2.js
ajuste no trab. 2
MERGE