Shifter
Merge remote-tracking branch 'ethan/master'
Foomatics :P
Foomatics :P
Merge pull request #8 from Ahmad-Bamba/master

Added Pnuematics.h and Pnuematics.cpp
Update AUTHORS.txt
Merge pull request #10 from bqtruong/master

Update AUTHORS.txt
added my name to AUTHORS.txt
shifter update
Merge branch 'master' of http://github.com/Mynameisspam1/612-2014 into merge

Conflicts:
	AUTHORS.txt
merge
Merge pull request #12 from ZackAlfakir/master

merge
shifter update
more shifter fixes
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014

Conflicts:
	Drivetrain-test.h
compiling shifter
Merge remote-tracking branch 'ethan/master'
Changed DriveTrain.cpp and .h, Added new file EncodeDistance
Test
Merge remote-tracking branch 'ethan/master'