Merge pull request #1 from GotRobotFTC5037/master

sync up
Merge pull request #8 from K-McK/master

Merge pull request #1 from GotRobotFTC5037/master
Merge pull request #3 from GotRobotFTC5037/master

fixes from Kristen