Delete Grup.php
Delete Grup.php~
Merge remote-tracking branch 'origin/master' into Carles