add a feature on a new branch feature (changed again)
Merge branch 'master' of https://github.com/ismo-conguairta/Spoon-Knife