Merge pull request #20 from sonnia/master

Sonia test
de la Sonnia
Pagina personala-Pinca Sonia

Merge branch 'development' of https://github.com/UAB2014/pabd2014