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 remote-tracking branch 'northern-bites/overhaul'

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

Success.