Changed DriveTrain.cpp and .h, Added new file EncodeDistance
Merge remote-tracking branch 'adrian/master' into adrian

Conflicts:
	main.h
merged, will fix compile errors with the class
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
Merge pull request #18 from ZackAlfakir/master

fixed Ahmad's compile errors
Update shifter
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014