Merge pull request #41 from Tryptophan/master

Push from teleop to master