git practice

why not manual
Merge branch 'dev' of https://github.com/WHSRobotics/542_14-15 into dev