fix
fix
Merge branch 'master' of https://github.com/archick12/hillel

Conflicts:
	.gitignore
	src/Test_kkondrashova.java