Merge remote-tracking branch 'ethan/master'
Merge remote-tracking branch 'ethan/master'
Merge remote-tracking branch 'ethan/master'
Merge pull request #18 from ZackAlfakir/master

fixed Ahmad's compile errors
Create L & R shifter
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014
Update shifter
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014
Fixed pneumatics
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014
Shifter compiles
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014
Merge branch 'master' of github.com:ethanhuey/612-2014

Conflicts:
	Shifter.cpp
	Shifter.h
Merge pull request #19 from ethanhuey/master

Shifter Updated
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014
anirudh updated pneumatics and etc
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