Add fitness and energy reset when a collision is detected
Fix uploaded filename and add generation number as a result variable
Merge remote-tracking branch 'origin/master'
Improve IO by tracking individual changes in objects
Fixes, fixes and fixes