Estil basic
Merge branch 'master' of github.com:nmaletm/Presentacio-TFG