edit class person
Merge branch 'master' of https://github.com/andrikhrisharyadi/test-repo

Conflicts:
	file2.java