Fix bad merge
Merge branch 'master' of https://github.com/axemclion/dronepark