fixed choochoo
Completed Calibration object -- WARNING: not tested.
Final Choo Choo fix.
Merge newchoochoo into master
Added Timer object.
Merge origin/camera

Conflicts:
	src/com/coderedrobotics/tiberius/Tiberius.java
Wut
Merge branch 'master' of https://github.com/CodeRed2771/Tiberius2014 into camera

Conflicts:
	src/com/coderedrobotics/tiberius/Tiberius.java
DAT CODE
Merge branch 'master' of https://github.com/CodeRed2771/Tiberius2014 into camera

Conflicts:
	src/com/coderedrobotics/tiberius/Tiberius.java
hot goal
Latest Broken Code
hot goal tuning
shortened auto drive