fix naming
Merge branch 'swav/fix-naming'
fix
Merge branch 'master' of github.com:fblandroidhackathon/weardrone
Merge branch 'swav/fix-maping-2'
added flip
Merge branch 'master' of github.com:fblandroidhackathon/weardrone
Merge branch 'swav/added-flip'