adding collision handling
Merge branch 'master' of https://github.com/allenpark/aquaticevolver
added collision detection
Merge branch 'master' of https://github.com/allenpark/aquaticevolver