Merge branch 'branchForMe'

Conflicts:
hello/hello.txt