Merge branch 'ADC_dev' of github.com:IEEERobotics/bot2014
Revert "Merge branch 'ADC_dev' of github.com:IEEERobotics/bot2014"

This reverts commit a151fa3b7609801d24f5f6519e300606efe47748, reversing
changes made to 4799cfc20110808808d1acc296f641f3b6c9dd6f.
Merge branch 'master' into ADC_dev