Kick Revolution, Solenoid Revolution
Kick Revolution, Solenoid Revolution
Kick Revolution, Solenoid Revolution
Syncing with Hackintosh.
Merge branch 'master' of https://github.com/frc3946/AerialAssist

Conflicts:
	AerialAssist/src/edu/wpi/first/wpilibj/templates/RobotMap.java