Modificacions Glòria I
Merge branch 'master' of https://github.com/mcomas/mixtures