A lot of changes in Attribution.java
Solving conflicts with Dani
Merge branch 'master' of https://github.com/SalamiCo/PLg-Grupo3