tested the controller
Merge branch 'Work'

Conflicts:
	FRC1318TestBed/src/org/usfirst/frc1318/MainIterativeComponentRobot.java
Merge branch 'master' of https://github.com/irs1318dev/irs1318TestBed.git