pinto java

.
Merge branch 'master' of https://github.com/4wesome/projecto_TPSI