Improve lock handling
Merge branch 'master' of https://github.com/FRC830/LaserBots