Merge remote-tracking branch 'antonio/devel' into devel
Incluido mi proyecto en gitignore
Añadida clase condon
Las tapas se acaban
Merge remote-tracking branch 'Manuel/devel' into devel
Merge remote-tracking branch 'Fernando/devel' into devel
Merge remote-tracking branch 'Fer/devel' into devel
Merge remote-tracking branch 'antonio/dorito' into devel
Merge remote-tracking branch 'antonio/devel' into devel
Merge remote-tracking branch 'Manuel/devel' into devel
Merge remote-tracking branch 'Manuel/devel' into devel