tyryasaw
Merge branch 'testBranch'

Conflicts:
	FunnyGameTask/src/main/java/com/creamtec/techtalk/game/app/Main.java