afgegir controlador de dades a entrega 2
Merge branch 'master' of github.com:JoRd118/PROP
Merge branch 'master' of github.com:JoRd118/PROP
Merge branch 'master' of github.com:JoRd118/PROP