Arreglando tests entrega 4
Merge branch 'master' of https://github.com/Gonzalo-F/DDS-2014.git