documentacio labo 1
Merge branch 'master' of github.com:lureg/UPC-IDI

Primer merge