fuck all
 tot
avera
borrar coses camio
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