Merge pull request #1 from griera/master

Canvis fets per mi