commit A test
Merge branch 'master' of https://github.com/kmd09/tutorial

Conflicts:
	sample.txt
fixed