Agregado carpetasl del idea al gitignore
Merge remote-tracking branch 'origin/master' into Sprint3