my new doc 10
Merge branch 'master' of https://github.com/dmeltz/Spoon-Knife