modified
Merge branch 'master' of https://github.com/tsubasaxZZZ/gittest

Conflicts:
	sample.txt