init
sysout 01
init
init
init
Merge branch 'master' into clubplus-server-takersk

Conflicts:
	src/main/java/WordTest.java