Commit message.
Merge branch 'master' of https://github.com/Rose-Hulman-ROBO4xx/1314-Mercury
Merge branch 'master' of https://github.com/Rose-Hulman-ROBO4xx/1314-Mercury