Arreglando travis 3 y cambiando Rakefile
q::Merge branch 'master' of https://github.com/alu3286/SYTW-Practica-6