ozCommit_03

ozCommit_03
ozCommit_03解决冲突后

Conflicts:
	GitHubTest3/bin/oz/bean/User.class
	GitHubTest3/src/oz/bean/User.java