删除了aviva打印
在Eclipse中添加了一个Person类
Merge branch 'master' of https://github.com/yuanzeyao2008/Hello.git

Conflicts:
	Hello/src/com/hello/Person.java