sa amb driver
sa i drivers
pre post
Merge branch 'pol'

Conflicts:
	projecte_prop/src/projecte_prop/Relations.java
fuck all
vamoooooos
Merge branch 'joan'