Test class
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/sample/Test.java
delete
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/sample/Main.java
	src/sample/Persss.java
Main new