dummy commit
Merge branch 'master' of https://github.com/nc61/robot

Conflicts:
	test/VidSURF.cpp
Changed navigation style