Conflict with edited files again
Merge branch 'master' of https://github.com/ivondrq/Spoon-Knife