Commit of post-Champs code.
Commit of pre 5-disk code.
Merge branch 'master' of https://github.com/brennonbrimhall/FRC2013
Commit of pre-5 disk code.