Merge branch 'Eric-Ian'
Merge branch 'master' of https://github.com/MissionBit/drone-lights