.
merging issue
Merge branch 'master' of https://github.com/ElizabethDuncan/comprobo_mobilerobotics
map flipped