Foobar

foo
Merge branch 'master' of https://github.com/robCam/Tinker
squashed the other commits