robot integration
Merge branch 'master' of https://github.com/irs1318dev/irs1318_2014

Conflicts:
	irs1318_2014_robot/src/irs2014/MainIterativeComponentRobot.java
	irs1318_2014_robot/src/irs2014/generalData/PortRef.java
	irs1318_2014_robot/src/irs2014/userInputDevices/ButtonRef.java
	irs1318_2014_robot/src/irs2014/userInputDevices/Joystick1Reader.java
	irs1318_2014_robot/src/irs2014/userInputDevices/UserInputData.java
changed shooter code
put old shooter code as 2 
changed new shooter code
Merge branch 'master' of https://github.com/irs1318dev/irs1318_2014

Conflicts:
	irs1318_2014_robot/src/irs2014/autonomous/AutonomousCommand.java