nose que collons es
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS
a
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS
pol ruc
a
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS

Conflicts:
	projecte_prop/nbproject/private/private.properties
element
A
Merge branch 'pol'

Conflicts:
	camio/src/camio/Cjt_Elements.java
	projecte_prop/src/projecte_prop/Cjt_Elements.java
	projecte_prop/src/projecte_prop/Element.java
cjt_elem borrat
swegfaw