problemas
Merge branch 'joan'
aaaaaaa
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS into Carlos2
Merge branch 'josep'
 aa
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS
sa amb driver
sa i drivers
pre post
fuck all
Merge branch 'pol'

Conflicts:
	projecte_prop/src/projecte_prop/Relations.java
fuck all
vamoooooos
Merge branch 'joan'
Ejemplo 3 capas
ctrlDomini no static
Merge branch 'master' into josep