some msg
Merge branch 'master' of https://github.com/nobso/tutorials
that file named "something" is removed
Merge branch 'master' of https://github.com/nobso/tutorials

Conflicts:
	something