added how to merge
Merge branch 'master' of https://github.com/UMKCRobotics/Chris-Git-Presentation