modified test4
Merge branch 'master' into br1
modified test5 in br1
modified test5 in master
Merge branch 'br1'

Conflicts:
	test5.txt
modified test5 in branch1
modified test5 in branch1 again
modified test5 in branch1 for pull request
modified test5 in branch1 for pull request
Merge pull request #3 from apienkowski/branch3

branch3