Merge remote-tracking branch 'ethan/master'
Merge remote-tracking branch 'ethan/master'
Merge remote-tracking branch 'ethan/master'
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014
Merge pull request #20 from swarage/master

anirudh updated pneumatics and main
such description
many compile
wow
such stupidity
wow
added updated Shifter.h
Merge pull request #21 from jbramnick/master

Shifters Compile
Fixed shifters, only uses one double solenoid