Not needed
Not needed
Merge branch 'master' into Javier

Adding .gitignore
Adding .gitignore
Merge branch 'Marta'

Should be the same...
Merge branch 'Javier'

Should be up-to-date...