blockfinding now uses us sensor
Merge remote-tracking branch 'origin/master'

Conflicts:
	Final Project/Main.nxd
	Final Project/Main.nxj
	Final Project/bin/.gitignore