Add some testing
Merge branch 'master' of github.com:m4rk4y/good-robot
Minor update