face++ api working
fixed merge
Merge branch 'master' of https://github.com/JoeLoser/DroneStalk