fix
Merge branch 'master' of
https://github.com/GeoffreyLong/EC_AssignmentOne

Conflicts:
	src/evolutionary/Selection.java