fixed logical exit issue
Merge branch 'zac'
Merge branch 'master' into robotSim_greenleaf