+algprim, de test
Merge branch 'joan'
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS