merging changes before pooltest
Merge branch 'master' of https://github.com/ncsurobotics/seawolf5

Conflicts:
	vision/entities/binscorner.py
Fix kill.sh to kill python PIDs