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

Conflicts:
	camio/nbproject/private/private.properties
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS

Conflicts:
	camio/nbproject/private/private.properties