Finalized autonomous code
Conflicts:
	src/edu/wpi/first/wpilibj/templates/OI.java
	src/edu/wpi/first/wpilibj/templates/commands/AutoCommand.java
simple auto code
Conflicts:
	src/edu/wpi/first/wpilibj/templates/OI.java
	src/edu/wpi/first/wpilibj/templates/RobotMap.java
	src/edu/wpi/first/wpilibj/templates/RobotTemplate.java
	src/edu/wpi/first/wpilibj/templates/commands/AutoCommand.java
	src/edu/wpi/first/wpilibj/templates/commands/AutoShoot.java
	src/edu/wpi/first/wpilibj/templates/commands/catapult/LauncherManual.java
	src/edu/wpi/first/wpilibj/templates/subsystems/Lights.java
reassembled code
Conflicts:
	src/edu/wpi/first/wpilibj/templates/RobotMap.java
	src/edu/wpi/first/wpilibj/templates/RobotTemplate.java
	src/edu/wpi/first/wpilibj/templates/commands/catapult/LauncherManual.java
	src/edu/wpi/first/wpilibj/templates/subsystems/Lights.java
completed auto code, cleaned
completed auto code, cleaned
Merge origin/master

Conflicts:
	src/edu/wpi/first/wpilibj/templates/RobotMap.java
	src/edu/wpi/first/wpilibj/templates/commands/RaiserPID.java
	src/edu/wpi/first/wpilibj/templates/commands/TankDrive.java
	src/edu/wpi/first/wpilibj/templates/commands/catapult/LauncherManual.java
Merge origin/master

Conflicts:
	src/edu/wpi/first/wpilibj/templates/RobotMap.java
	src/edu/wpi/first/wpilibj/templates/commands/RaiserPID.java
	src/edu/wpi/first/wpilibj/templates/commands/TankDrive.java
	src/edu/wpi/first/wpilibj/templates/commands/catapult/LauncherManual.java
Merge master2

Conflicts:
	src/edu/wpi/first/wpilibj/templates/RobotMap.java
	src/edu/wpi/first/wpilibj/templates/commands/CrazyDance.java
	src/edu/wpi/first/wpilibj/templates/commands/ReverseTankDrive.java
	src/edu/wpi/first/wpilibj/templates/commands/TankDrive.java
	src/edu/wpi/first/wpilibj/templates/commands/catapult/LauncherManual.java