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

Conflicts:
	Final Project/Main.nxd
	Final Project/Main.nxj
	Final Project/bin/.gitignore
Merge branch 'master' of https://github.com/michael-golfi/DPM

Conflicts:
	Final Project/Main.nxd
	Final Project/Main.nxj
	Final Project/bin/.gitignore
	Final Project/bin/controller/MotorController.class
	Final Project/bin/odometry/Odometer.class
merging
Changed odometer, more integration