concrift commit
Merge branch 'master' of https://github.com/megaya/sample

Conflicts:
	hello.txt