atualizacoes
Merge branch 'master' of https://github.com/RubensBR/ProjetoLP3

Conflicts:
	BusaoJP/project.properties
Merge branch 'master' of https://github.com/RubensBR/ProjetoLP3

Conflicts:
	.gitignore
	BusaoJP/project.properties
Merge branch 'master' of https://github.com/RubensBR/ProjetoLP3
Servidor teste ok