Merge branch 'Juan-Antonio' into Maquetas
Merge branch 'Maquetas' of https://github.com/eadpucv/giornata into Maquetas