merge fail.
Merge branch 'master' of github.com:jasonthomas/teddy