Merged Alex into integration
Merge branch 'alex' into integration
Added TopLiftCommands
Deleted .csettings and ignored PPC-whateverthingy
Ignored Release and Debug Directories
Fixed my ShootIdleCommands and IntakeIdleCommands
Got rid of old ShootCommands
Merge branch 'sam' into alex

Conflicts:
	.cproject
	.gitignore
	.project
	Commands/IntakeIdleCommand.cpp
	OperatorInput.cpp
Ignored .orig files
Ignored Debug dir
Merge branch 'sam' into alex
Remove all!

Conflicts:
	Commands/DriveForwardAutoCommand.h
Added all of Sam's branch into mine own
Merge branch 'sam' into alex
Made CoprocessorVision and CameraRotateToTargetCommand. Mapped camStick
Button 8 to CameraRotateToTargetCommand. Added DriveSubsystem to
SmartDashboard.
Added CamSensor
Merge branch 'sam' into alex

Conflicts:
	BallSensor.h
	Commands/JoyStickDriveCommand.cpp
	Commands/ResetCamCommand.h
	Commands/ShooterTakeShotCommand.cpp
	Commands/ShooterTakeShotCommand.h
	CoprocessorVision.cpp
	OperatorInput.cpp
	OperatorInput.h
	Subsystems/BallIntakeSubsystem.cpp
	Subsystems/BallIntakeSubsystem.h
	Subsystems/BottomLiftSubsystem.cpp
	Subsystems/BottomLiftSubsystem.h
	Subsystems/ShooterSubsystem.cpp
	Subsystems/ShooterSubsystem.h
	Subsystems/TopLiftSubsystem.cpp
	Subsystems/TopLiftSubsystem.h
Added CoprocessorVision to this repository
Deleted orig files
Merge branch 'sam' into alex