cats
Merge branch 'master' of https://github.com/hosthvo/sample1

Conflicts:
	file1.txt