Merge origin/master

Conflicts:
	Bounties/src/sim/app/bounties/GossipTableRobot.java


merged and also something terrible went wrong.... i changed it so that we would punish ourself if something bad happened but now they're waiting to get boundies that are far away