Merged Alex into integration
Merge branch 'alex' into integration
Shooter Code Functional
All speed controllers and related commands set up
Merge branch 'sam' into alex
Removed Example Subsystem and Commands from Code
Added Preference Usage for Commands (not tested)
Remove all!

Conflicts:
	Commands/DriveForwardAutoCommand.h
Added all of Sam's branch into mine own
Fully Functional Drive + other subsystems code
Added Commented Out Corner Alignment Code
Implemented Autonomous Corner Finder, UNTESTED
Removed BallLoaderSubsystem and Commands
Added Potentiometer Code and started RotateAngleCommand code
Merge branch 'sam' into alex
Merge branch 'sam' of http://github.com/Nashoba-Robotics/Nashoba-Robotics2012 into sam

Conflicts:
	AnalogIRSensor.cpp
	AnalogIRSensor.h
	BallTracker.cpp
	BallTracker.h
	CommandBase.cpp
	CommandBase.h
	CommandBasedRobot.cpp
	Commands/AlignBackWithWallCommand.cpp
	Commands/AlignBackWithWallCommand.h
	Commands/AlignFrontWithWallCommand.cpp
	Commands/AlignFrontWithWallCommand.h
	Commands/DriveDurationCommand.cpp
	Commands/DriveToCornerCommand.cpp
	Commands/DriveToCornerCommand.h
	Commands/IntakeIdleCommand.cpp
	Commands/IntakeRejectContinuousCommand.cpp
	Commands/JoyStickDriveCommand.cpp
	Commands/RightTurnCommand.cpp
	Commands/RotateAngleCommand.h
	HardwareSettings.h
	OperatorInput.cpp
	Subsystems/DriveSubsystem.cpp
	Subsystems/DriveSubsystem.h
	Subsystems/ShooterSubsystem.cpp
Code For Alex To Continus Working On When I'm Gone
SmartDashboard stuff added, Sensors are being worked on
"Reput" files
Conflicts:
	AnalogIRSensor.cpp
	BallTracker.cpp
	BallTracker.h
	CommandBase.cpp
	CommandBasedRobot.cpp
	Commands/AlignBackWithWallCommand.cpp
	Commands/AlignFrontWithWallCommand.cpp
	Commands/BottomLiftIdleCommand.cpp
	Commands/DriveDurationCommand.cpp
	Commands/DriveDurationCommand.h
	Commands/DriveToCornerCommand.cpp
	Commands/IntakeIdleCommand.cpp
	Commands/JoyStickDriveCommand.cpp
	Commands/ShooterReadyShotCommand.cpp
	Commands/ShooterTakeShotCommand.cpp
	Commands/ShooterTakeShotCommand.h
	HardwareSettings.h
	OperatorInput.cpp
	OperatorInput.h
	Subsystems/BallIntakeSubsystem.cpp
	Subsystems/BallIntakeSubsystem.h
	Subsystems/BottomLiftSubsystem.cpp
	Subsystems/BottomLiftSubsystem.h
	Subsystems/DriveSubsystem.cpp
	Subsystems/DriveSubsystem.h
	Subsystems/ShooterSubsystem.cpp
	Subsystems/ShooterSubsystem.h
	Subsystems/TopLiftSubsystem.cpp
	Subsystems/TopLiftSubsystem.h
Deleted unneccesary files created by Git stupidity