Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS
Merge branch 'josep'
ctrlDomini no static
edge crossover
jp3
ctrlDomini no static
principio capa grafica
interfaz grafica
joan tonto aqui ho tens