Set up solenoid test runners
Merge branch 'master' into work

Conflicts:
	FRC1318TestBed/src/org/usfirst/frc1318/FRC2013/calculators/ShooterCalculator.java
	FRC1318TestBed/src/org/usfirst/frc1318/FRC2013/controllers/GamePadReader.java
	FRC1318TestBed/src/org/usfirst/frc1318/FRC2013/reference/GamePad1Ref.java
	FRC1318TestBed/src/org/usfirst/frc1318/MainIterativeComponentRobot.java
Robot works! no PID yet.