Merge branch 'master' of https://github.com/Chantilly612Code/612-2014

Conflicts:
	main.h
IGNORE THIS COMMIT

Conflicts:
	DriveTrain.h
	main.h
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014

Conflicts:
	DriveTrain.cpp
	DriveTrain.h
	main.h
Made more functions (particularly autoTurn) and actually worked on EncodeDistance

Conflicts:
	main.cpp
	main.h
add Controller.h and Port.h
deleted weird Shifter.cpp~
added DriveTrain to main
Commented out pnum & shifters.
Merge pull request #23 from ethanhuey/master

add Controller.h & Port.h
Merge remote-tracking branch 'adrian/master'
fixed compile errors
Merge pull request #24 from ZackAlfakir/master

fixed compile errors (Commented out)
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014

Conflicts:
	main.cpp