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

Conflicts:
	MasterRobot/src/edu/wpi/first/wpilibj/templates/RobotTemplate.java