Stop Estimates, stopEstimatePair
Merge branch 'master' of https://github.com/sellers04/BeaverBus

Conflicts:
	BeaverBus/BB_ShuttleUpdater.m
	BeaverBus/BB_ViewController.m