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
Merge pull request #465 from emamanto/overhaul_master

Behaviors, Motion, and Everything Else
fixes robot stuck in stand without standing
cleans up CoreSoccerStates
removes annoying prints from Guardian
cleans up some unneeded behavior files
Bill's fixes to our botched constants.
Small pool size fixes and watson camera params.
fixes standing up. it works! closes #457. closes #458.
Merge pull request #466 from emamanto/overhaul_master

Epic Cleanup
Merge remote-tracking branch 'northern-bites/overhaul' into overhaul
removes dumb printline
Merge branch 'overhaul' of github.com:wdawson/nbites into overhaul_tool
Merge pull request #467 from wdawson/overhaul

Falling/Standup/Stiffness
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.