Yo
Merge branch 'master' of https://github.com/WestervilleWildWarbots/master
Merge branch 'master' of https://github.com/WestervilleWildWarbots/master

Conflicts:
	MasterRobot/src/edu/wpi/first/wpilibj/templates/commands/twoBallAutonomous/LowerWinchTwoBall.java
Merge branch 'master' of https://github.com/WestervilleWildWarbots/master

Conflicts:
	MasterRobot/src/edu/wpi/first/wpilibj/templates/commands/twoBallAutonomous/LowerWinchTwoBall.java
Refactored most of auto, notably removed a half second of excess delay for servos
Autonomous is mostly refactored