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

Conflicts:
	bin/.gitignore