O
Merge branch 'master' of https://github.com/archick12/hillel
ver 1
new branch dsaranyuk
edit code and comment
version 1.1

Signed-off-by: Alexandr Stepurko <Stepurko.Alexandr@gmail.com>
kate.ver.1
kate.ver.1.1
versik 1
ver.2
no message

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

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

Signed-off-by: Денис <antonov.d@hotmail.com>
versik 1
Fix
Merge branch 'master' of https://github.com/archick12/hillel

Conflicts:
	.idea/modules.xml
Merge remote-tracking branch 'origin/dantonov'

Conflicts:
	.gitignore
	src/HelloWorld.java
Merge remote-tracking branch 'origin/kkondrashova'

Conflicts:
	.gitignore
Merge remote-tracking branch 'origin/blupashko'

Conflicts:
	src/HelloWorld.java
Merge remote-tracking branch 'origin/test_AStepurko'