all
 branch 'master' of https://github.com/csugrue/diseno-interactivo

ase enter a commit message to explain why this merge is necessary,
ecially if it merges an updated upstream into a topic branch.

es starting with '#' will be ignored, and an empty message aborts
 commit.