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
Fixed mah shooter and der stuff u told meh to do :D
Merge pull request #53 from ChampD/master

Added Sensors object, fixed capitalization of Sensor class
Merge pull request #52 from BenNgu/master

joiaseofwejaf
added punch spaghetti to shooter
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014 into test