Merge pull request #1 from dym99/master

Adding catapult controls for testing.
added flipper code to reset one of the flippers