Commit pasta(pagina) submissao
testando
Merge branch 'master' of
https://github.com/PETComputacaoUFCG/SiteENEPET2014

Conflicts:
	docs/html/carousel/index.html
	docs/html/navbar-static-top/index.html
	docs/html/starter-template(2)/index.html
	docs/html/starter-template(3)/index.html
	docs/html/starter-template/index.html
Merge branch 'master' of https://github.com/PETComputacaoUFCG/SiteENEPET2014