cleaned up
Merge branch 'master' of github.com:daniel-ruess/FRC-3932