3
Merge branch 'master' of https://github.com/ulysses0604/tutorial

Conflicts:
	Sample.txt