adding local modification to the second line of file.txt
Merge branch 'master' of https://github.com/mangint/Spoon-Knife

Conflicts:
	file.txt