Merge branch 'joan'
Merge branch 'joan'
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS

Conflicts:
	projecte_prop/src/projecte_prop/Twoapp.java
Merge branch 'joan'

Conflicts:
	projecte_prop/src/projecte_prop/Twoapp.java
Merge branch 'joan'
por dios que se suba bien