Edit text2 in branch5
Edit text2 in branch 1...
Merge pull request #5 from klab-ou-h/branch5

Edit text2 in branch5
Merge from master. After restoring text2.