コミット
Merge branch 'master' of https://github.com/ikkun2501/Study

Conflicts:
	Interface/src/sample3/Main.java
	Interface/src/sample3/Person.java
	Interface/src/sample4/Main.java
	Interface/src/sample4/Person.java
	Interface/src/sample4/Profile.java