conflict test
Merge branch 'master' of https://github.com/gamers86/tutorail

Conflicts:
	sample.txt