Merge branch 'master' of github.com:buildbotics/machine-controller
authorJoseph Coffland <joseph@cauldrondevelopment.com>
Sun, 28 Feb 2016 06:23:16 +0000 (22:23 -0800)
committerJoseph Coffland <joseph@cauldrondevelopment.com>
Sun, 28 Feb 2016 06:23:16 +0000 (22:23 -0800)

Trivial merge