que la donguin
Merge branch 'master' of https://github.com/hersftw/prop

Conflicts:
	bin/prop/domini/Assignacio.class
	bin/prop/domini/Categoria.class
	bin/prop/domini/Conica.class
	bin/prop/domini/Distribucio.class
	bin/prop/domini/Lineal.class
	bin/prop/domini/Llibreria.class
	bin/prop/drivers/driverLlibreria.class