two changes remote and local
Merge branch 'master' of github.com:camohub/Spoon-Knife