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

Conflicts:
	Drivetrain-test.h
compiling shifter
Test
Merge pull request #14 from ZackAlfakir/master

Merged from AdrianDeVera
fixed encoder pointer
Merge pull request #16 from ethanhuey/master

Shifter
fixed Ahmad's compile errors