Little something
Working shooter stuff (1st try m8)
Merge branch 'ShooterBranch' of https://github.com/WestervilleWildWarbots/master into ShooterBranch

Conflicts:
	MasterRobot/src/edu/wpi/first/wpilibj/templates/OI.java
	MasterRobot/src/edu/wpi/first/wpilibj/templates/RobotMap.java
	MasterRobot/src/edu/wpi/first/wpilibj/templates/commands/LowerWinchCommand.java
	MasterRobot/src/edu/wpi/first/wpilibj/templates/commands/MonitorCommand.java
	MasterRobot/src/edu/wpi/first/wpilibj/templates/commands/ResetEncoderCommand.java
	MasterRobot/src/edu/wpi/first/wpilibj/templates/commands/RunWinchCommand.java
	MasterRobot/src/edu/wpi/first/wpilibj/templates/subsystems/DriveSubsystem.java
	MasterRobot/src/edu/wpi/first/wpilibj/templates/subsystems/ShooterSubsystem.java