A 结构的结果有了
Merge branch 'master' of https://github.com/youngjerky/SocialNetNGeo

Conflicts:
	bin/org/zju/Person.class
	bin/org/zju/SocialNetNGeo.class