line 4
line 5
line 4.5
Merge branch 'master' into todelete
Issue 596: update the helloworld text file

Fixes #596