fuck all
Merge branch 'pol'

Conflicts:
	projecte_prop/src/projecte_prop/Relations.java