Added collision, derivative compensations
End of day friday
Merge branch 'master' of https://github.com/brockkopp/miGAplanning