Merge branch 'master' of github.com:eulersantana/CG into gh-pages

Conflicts:
	victor/trabalho2/t2.html
	victor/trabalho2/t2.js
resolvendo o conflito