Merge origin/master

Conflicts:
	AerialAssist/nbproject/private/private.xml
	AerialAssist/src/edu/wpi/first/wpilibj/templates/commands/Autonomous.java
Merge origin/master

Conflicts:
	AerialAssist/nbproject/private/private.xml
	AerialAssist/src/edu/wpi/first/wpilibj/templates/commands/Autonomous.java
Merge origin/master

Conflicts:
	AerialAssist/nbproject/private/private.xml
	AerialAssist/src/edu/wpi/first/wpilibj/templates/commands/Autonomous.java
Merge origin/master

Conflicts:
	AerialAssist/src/edu/wpi/first/wpilibj/templates/commands/AdjustSpeed.java
	AerialAssist/src/edu/wpi/first/wpilibj/templates/commands/AdjustTime.java
	AerialAssist/src/edu/wpi/first/wpilibj/templates/commands/MoveBoot.java
Merge origin/master

Conflicts:
	AerialAssist/src/edu/wpi/first/wpilibj/templates/commands/AdjustSpeed.java
	AerialAssist/src/edu/wpi/first/wpilibj/templates/commands/AdjustTime.java
	AerialAssist/src/edu/wpi/first/wpilibj/templates/commands/MoveBoot.java
Merge origin/master

Conflicts:
	AerialAssist/src/edu/wpi/first/wpilibj/templates/commands/AutoAim.java
	AerialAssist/src/edu/wpi/first/wpilibj/templates/commands/MoveBoot.java
	AerialAssist/src/edu/wpi/first/wpilibj/templates/commands/PrintThreadPiData.java
Merge origin/master

Conflicts:
	AerialAssist/nbproject/private/private.xml
	AerialAssist/src/edu/wpi/first/wpilibj/templates/commands/KickBall.java
	AerialAssist/src/edu/wpi/first/wpilibj/templates/commands/LowerArm.java
	AerialAssist/src/edu/wpi/first/wpilibj/templates/subsystems/Boot.java