the fifth commit
Merge branch 'master' of
ssh://git@github.com/PLANET-SOFT/javaProject.git

Conflicts:
	test4/src/com/planetsoft/service/Main.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	test4/src/com/planetsoft/service/Main.java