minor changes
Merge branch 'master' of github.com:aukejw/AI-Project--Visual-SLAM

Conflicts:
	src/naostream.cpp
More x33d formatting