Subindo novos arquivos.
Teste
Merge branch 'master' of https://github.com/projetosoftufrpe/recilife

Conflicts:
	.target/views/index.scala.html
	app/views/academia.scala.html
	app/views/calendario.scala.html
	app/views/dengue.scala.html
	app/views/diabetes.scala.html
	app/views/dst.scala.html
	app/views/hipertensao.scala.html
	app/views/index.scala.html
	app/views/obesidade.scala.html
	app/views/postos.scala.html
	app/views/prevencao.scala.html
	app/views/sobre.scala.html
	app/views/tabagismo.scala.html
	app/views/vacinacao.scala.html