More competition adjustments
Merge branch 'master' of https://github.com/ncsurobotics/seawolf5