testing patch
testing patch
Merge branch 'master' of https://github.com/ismo-conguairta/Spoon-Knife
add tmp/ dir (changed)
modify file .gitignore
add .gitattributes (changed)
first commit on a new branch
add a feature (changed again)
add a feature on a new branch feature (changed again)