pujar segona
Merge branch 'master' of https://github.com/crossbower13/projecte.git