Merge remote-tracking branch 'origin/master'
sqdfqsdf
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	MDGPv/src/MDGP/Distances.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	MDGPv/src/MDGP/Distances.java
	MDGPv/src/MDGP/Individual.java