some lifter stuff
Merge branch 'temp'

Conflicts:
	FRC1318TestBed/src/org/usfirst/frc1318/FRC2013/reference/PortRef.java