Modifies Person and Rodrigo classes
This is another attempt of commit
Resove conflicts in Person.java
Merge branch 'master' of https://github.com/darthega/wat-git-test