Merge pull request #38 from FIRST-4030/stable

This code is STABLE and is the last code that was run on the ROBOT.
Merge pull request #40 from FIRST-4030/master

This is a merge of a merge