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

pls
Conflicts:
	Drivetrain-test.h
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014
Merge branch 'master' of https://github.com/ethanhuey/612-2014
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014
update
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014
Merge branch 'test' of https://github.com/ethanhuey/612-2014
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014
update autonomous
Removed project files