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

Conflicts:
css/pyxis.css
avance de Home