collision fix
Merge branch 'master' of https://github.com/pyjamads/pyrocopter