added a method to launcher to convert input from sensor to PSI
Merge origin/master
added an algorithm to maintain pressure in chargeShootingPistons() method
added an algorithm to maintain pressure in chargeShootingPistons() method
Merge origin/master

Conflicts:
	FRC2014/src/edu/wpi/first/wpilibj/templates/RobotTemplate.java
working on test code