test.
Merge branch 'testEgit2'

Conflicts:
	bin/com/ce/Product.class
Merge branch 'master' of github.com:larrysoup/Test-Egit
Update nickName.
Merge branch 'master' of github.com:larrysoup/Test-Egit

Conflicts:
	bin/com/ce/Product.class
	src/com/ce/Person.java
V3