3 commit

Signed-off-by: Andrey Rukosuev <a.rukosuev@gmail.com>
Merge branch 'master' of github.com:SmileOmsk/try_git

Conflicts:
	hello.txt
hhhh