Merge remote-tracking branch 'origin/carlos'
class Solution + Ctrl Solution + Ctrl Ciutat
2
alguna cosa
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS
Merge branch 'pol'
Tot arreglat :)