Merge pull request #106 from clintbellanger/master

Merge from master branch
Corrections to ally collision
Merge pull request #717 from RyanDansie/flying_collision

Corrections to ally collision