FRC2994/Robot-2014 — pull request #17 by stdaniel2994 (2014-02-18 01:57:54+00:00)
Title: Changes after initial integration with competition robot

These changes were initially made on a stale repo. They were stashed, the repo was sync'd with upstream then the stash popped and a conflict resolved with the encode values.