proposed program structure works and field oriented control is a success!
proposed program structure works and field oriented control is a success!
Merge origin/master

Conflicts:
	src/edu/wpi/first/wpilibj/templates/DriveTrain.java
	src/edu/wpi/first/wpilibj/templates/Sensors.java
	src/edu/wpi/first/wpilibj/templates/Team5181Robot.java
Merge origin/master

Conflicts:
	src/edu/wpi/first/wpilibj/templates/DriveTrain.java
	src/edu/wpi/first/wpilibj/templates/Sensors.java
	src/edu/wpi/first/wpilibj/templates/Team5181Robot.java
Merge origin/master

Conflicts:
	src/edu/wpi/first/wpilibj/templates/DriveTrain.java
	src/edu/wpi/first/wpilibj/templates/Sensors.java
	src/edu/wpi/first/wpilibj/templates/Team5181Robot.java
Merge origin/master

Conflicts:
	src/edu/wpi/first/wpilibj/templates/DriveTrain.java
	src/edu/wpi/first/wpilibj/templates/Sensors.java
	src/edu/wpi/first/wpilibj/templates/Team5181Robot.java
testing rangefinder
testing rangefinder