commit
Merge remote-tracking branch 'origin/branchTest1'

Conflicts:
	src/mina1/mina2.java