my new class
my commnet
AAA
BBB
Merge branch 'mybra'

Conflicts:
	MyTest/src/add/Try.java
masdter
ne class- yoyo
Merge branch 'mybra'