Odometry + stopping included
Merge branch 'master' of github.com:jmelion/IVR2

Conflicts:
	kheperam/worlds/.khepera.6.2.wbt.project