hh
new Sub1
changes
ok
first commit
Merge branch 'submaster'

Conflicts:
	src/com/examples/ex.java
Merge remote-tracking branch 'origin/submaster1'

Conflicts:
	src/com/examples/ex.java
Merge pull request #2 from krishna-reddy/master

changes