moving from test to java
Merge branch 'master' of https://github.com/cuba96/TPFinal