lots of new code
Merge branch 'master' of github.com:tebriel/sphero