Avoiding obstacles in weird/hard-to-think-of situations :D
Merge branch 'master' of github.com:jmelion/IVR2

Conflicts:
	kheperam/controllers/matlabcontrol/matlabcontrol.m