Merge branch 'master' of https://github.com/benrbray/AdamBots-FIRST-2013-Robot-Code.git into teleop-development
Added call to super in constructor.
Committing to fix issue with git
Manually updated MagicBox
Revert "Added call to super in constructor."

This reverts commit be5f269063c90b93ad16ff53995a2850e3364517.
Changed MagicBox references to be static.