fixed some weird-ass merging that I did
having problems pushing, stackoverflow reccomended making a dummy commit
Merge branch 'fview_ballloc' of git://github.com/bjacobel/nbites
Moves Camera.h to where the tool can use it too.
Makes colortablecreator sort of compile.
Puts the subdiagram in place and seems to hook it up properly.
Makes the display listeners work alright.
Sort of displaying the thr image, but it is nonsense.
Stuff kind of works.
Fixes snapshot states?
Bill's fixes to our botched constants.
Small pool size fixes and watson camera params.
Merge branch 'overhaul' of github.com:wdawson/nbites into overhaul_tool
Fixes broken images and makes image logging work more or less okay.
Non-stripy camera params for watson.
Makes logging images work reasonably.
Makes the tool fail slightly more gracefully if you don't have two image logs.
Small sat fix for oversaturated ball.
Merge remote-tracking branch 'northern-bites/overhaul'

Conflicts:
	src/tool/image/old/PaintBots.cpp
Merge pull request #470 from wdawson/master

Success.