Fix WaitForButton
Initial successful test
More testing
Remove launch sequence waits
Sunday testing. Shooting mostly automated
Automate shooting more
Give Conditionals a name
Merge Tim's new stuff, fix it

Conflicts:
	src/storm2014/OI.java
	src/storm2014/subsystems/Catapult.java
	src/storm2014/subsystems/LEDRing.java