Dealing with conflicts
Merge branch 'master' of
https://github.com/GeoffreyLong/EC_AssignmentOne.git

Conflicts:
	src/evolutionary/Crossover.java