Edit text2 in branch4
Edit text2 in branch4 again
Merge pull request #4 from klab-ou-h/branch4

Branch4
Merge remote-tracking branch 'origin' into branch1
Edit text2 in branch1.