new variable in brach
Merge remote-tracking branch 'origin/testbranch'

Conflicts:
	src/testgit/TestBranchone.java