added my name to AUTHORS.txt
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 branch 'master' of https://github.com/Chantilly612Code/612-2014
Merge branch 'master' of https://github.com/ethanhuey/612-2014
Changed DriveTrain.cpp and .h, Added new file EncodeDistance
Test
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
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014