Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
cells get now sorted by their speed
*
Merge remote-tracking branch 'robin/master'
fixed breeder (really this time!)
Merge remote-tracking branch 'koen/master'

Conflicts:
	src/objects/breeders/CrossoverBreeder.java
fixed robins nullpointers
robin indentatie
Commit 3.2

-Mating now costs energy (A lot!)
-check for energy to mate
-middle mouse buttons start whole iteration