commit branch3
commit branch4
add branch5
Merge pull request #7 from ivanixgames/branch4

Branch4
Merge branch 'branch5' of https://github.com/ivanixgames/testbranch into ivanixgames-branch5

Conflicts:
	branch3/hello.txt
Merge branch 'ivanixgames-branch5' into testdev2