smile text added
write some text in smile.txt file
Merge branch 'master' into tst_branch

Conflicts:
	smile.txt