Fixed some formatting
Merge branch 'master' of https://github.com/txominpelu/ls-tp2