Syncing after Yestereve's work
Merge branch 'master' of https://github.com/frc3946/AerialAssist

Conflicts:
	AerialAssist/build/app.jar
	AerialAssist/build/classes/edu/wpi/first/wpilibj/templates/RobotMap.class
	AerialAssist/build/classes/edu/wpi/first/wpilibj/templates/RobotTemplate.class
	AerialAssist/build/classes/edu/wpi/first/wpilibj/templates/commands/CommandBase.class
	AerialAssist/build/classes/edu/wpi/first/wpilibj/templates/commands/KickBall.class
	AerialAssist/build/classes/edu/wpi/first/wpilibj/templates/subsystems/Boot.class
	AerialAssist/build/classes/edu/wpi/first/wpilibj/templates/subsystems/DriveTrain.class
	AerialAssist/build/classes/edu/wpi/first/wpilibj/templates/subsystems/LoadingArm.class
	AerialAssist/build/preverify/edu/wpi/first/wpilibj/templates/RobotMap.class
	AerialAssist/build/preverify/edu/wpi/first/wpilibj/templates/RobotTemplate.class
	AerialAssist/build/preverify/edu/wpi/first/wpilibj/templates/commands/CommandBase.class
	AerialAssist/build/preverify/edu/wpi/first/wpilibj/templates/commands/KickBall.class
	AerialAssist/build/preverify/edu/wpi/first/wpilibj/templates/subsystems/Boot.class
	AerialAssist/build/preverify/edu/wpi/first/wpilibj/templates/subsystems/DriveTrain.class
	AerialAssist/build/preverify/edu/wpi/first/wpilibj/templates/subsystems/LoadingArm.class