s1
Merge branch 'mavenVersion' of github.com:juliosueiras/java3FinalProject into mavenVersion

important