Cap 4·
Merge branch 'master' of github.com:DSI-ETSII-ULL/KWYJIBO into rama_made

Mergeando
Merge branch 'master' of github.com:DSI-ETSII-ULL/KWYJIBO into rama_made

Mergeando
Cap5 HTML
Cap5 HTML
Travis
Cap5 HTML
Merge branch 'master' of github.com:DSI-ETSII-ULL/KWYJIBO

Pulleando
Cap5 HTML
Cap5 Arreglando Test
Cap 5
Merge branch 'master' of github.com:DSI-ETSII-ULL/KWYJIBO into rama_made

Pulleando
Cap 5