Changes to fix errors
Merge branch 'master' of github.com:MarialeDavila/Master-Thesis
Merge branch 'master' of github.com:MarialeDavila/Master-Thesis
Merge branch 'master' of github.com:MarialeDavila/Master-Thesis
Merge branch 'master' of github.com:MarialeDavila/Master-Thesis