Reworked LoadingArm to use G2's most recent piston arm idea.

and other syncing
Reworked LoadingArm to use G2's most recent piston arm idea.

and other syncing
Reworked LoadingArm to use G2's most recent piston arm idea.

and other syncing
First update from TortoiseGit
Reworked LoadingArm to use G2's most recent piston arm idea.

and other syncing
Reworked LoadingArm to use G2's most recent piston arm idea.

and other syncing
Merge branch 'master' of https://github.com/frc3946/AerialAssist

Conflicts:
	AerialAssist/nbproject/private/private.xml
	AerialAssist/src/edu/wpi/first/wpilibj/templates/PrintThreadPiData.java
	AerialAssist/src/edu/wpi/first/wpilibj/templates/RobotMap.java
	AerialAssist/src/edu/wpi/first/wpilibj/templates/commands/Autonomous.java
	AerialAssist/src/edu/wpi/first/wpilibj/templates/commands/LowerArm.java
	AerialAssist/src/edu/wpi/first/wpilibj/templates/subsystems/LoadingArm.java
fixing the kicker