modifcation from desktop:
Merge branch 'master' of https://github.com/vlana/test

Conflicts:
	hello.txt