commit
Merge branch 'master' of https://github.com/liperosas/ProjetoPSC.git

Conflicts:
	bin/.gitignore
Merge branch 'master' of https://github.com/liperosas/ProjetoPSC.git

Conflicts:
	.classpath
	bin/daoImpl/AlternativaDAOImpl.class
	bin/negocios/RNPessoa.class