Merge pull request #2 from GotRobotFTC5037/master

sync up
12/3/14_1
Merge pull request #13 from K-McK/master

12/3/14_1
Merge pull request #6 from GotRobotFTC5037/master

sync up