working on auto lifter stuff
stuff... need to update joystick stuff for 2 lifting buttons
Merge branch 'temp'

Conflicts:
	FRC1318TestBed/src/org/usfirst/frc1318/FRC2013/controllers/GamePadReader.java
lifter macro stuff
Merge branch 'master' of https://github.com/irs1318dev/irs1318TestBed.git
Merge branch 'temp'