тест11
Merge branch 'master' of https://github.com/nik-gubin/a

Conflicts:
	JavaApplication10/src/javaapplication10/JavaApplication10.java
Merge branch 'master' of https://github.com/nik-gubin/a

Conflicts:
	JavaApplication10/src/javaapplication10/JavaApplication10.java