Merge remote-tracking branch 'upstream/master'
final us
changed vectorlist to vector
changed arraylists to vector, merged with robin
@
went back to arraylist. apparently beter because it doesnt syncronize
Commit 2.5 Robin

-begin on the mate behaviour and necessary methods
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Commit 3.1 Robin

-voor markus
Merge remote-tracking branch 'robin/master'
fixed breeder (really this time!)
Merge remote-tracking branch 'koen/master'

Conflicts:
	src/objects/breeders/CrossoverBreeder.java