Merge pull request #3 from GotRobotFTC5037/master

sync up
12/3/14_3
Merge pull request #16 from K-McK/master

12/3/14_3