increased inflation radius of obstacles
Merge remote-tracking branch 'upstream/master'
Adding obstacle avoiding and a very clunky, nonfunctional combination of both classes