pacman inicio
Merge branch 'group6/develop' into group6/master
..