Merge pull request #40 from Tryptophan/teleop

Super Regionals Championship Teleop Push
Merge pull request #41 from Tryptophan/master

Push from teleop to master