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

Signed-off-by: Денис <antonov.d@hotmail.com>

Conflicts:
	.idea/modules.xml