Merge pull request #4 from GotRobotFTC5037/master

sync up
12/6/14_2
12/8/14
Merge pull request #19 from K-McK/master

all tele op changes