ajeitando navbar
Merge branch 'master' of https://github.com/PETComputacaoUFCG/SiteENEPET2014

Conflicts:
	docs/html/carousel/index.html
Merge branch 'master' of https://github.com/PETComputacaoUFCG/SiteENEPET2014

Conflicts:
	docs/html/carousel/index.html