More stuff
Merge origin/master

Conflicts:
	Robot2014-nonaem/nbproject/project.bak.xml
Began speed calibration code.
Merge origin/master

Conflicts:
	Robot2014-nonaem/src/edu/wpi/first/wpilibj/templates/Steering.java