commit
Merge branch 'master' of https://github.com/amamstudio/GitTutorial

Conflicts:
	sample.txt