O
fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/misc.xml
	.idea/modules.xml
no message
Fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
fix issues wih git ignore
ver 2
test
fix
test
Merge pull request #2 from archick12/test

Test
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