commit

test
Merge branch 'master' of https://github.com/spdog-tp/test

Conflicts:
	sample.txt