local changes?
merge conflict
merge conflict
merge conflict
Merge branch 'master' of https://github.com/proftom/QuadCopter
fixed image labeling
Merge branch 'master' of https://github.com/proftom/QuadCopter