new content of something.txt
Merge branch 'master' into fix

Conflicts:
	something.txt