Merge pull request #32 from pstephen43/sr_dev

sync up
teleop fix
defencive work
defence and S3
Merge pull request #224 from K-McK/sr_dev

sync up