new Sub1
ok
Merge remote-tracking branch 'origin/submaster1'

Conflicts:
	src/com/examples/ex.java