Revert "Note to self"

This reverts commit 5789fb1ae6a46dee9325cff24a10f122e59945ed.
Merge branch 'master' of https://github.com/frc2399/2014-preseason