initial project version
My first commit
obratka
escho odin commit add new
made a change
master chenge
broken e-mail address
finish footer [testing]
Merge branch 'testing'

Conflicts:
	hello.txt
commit for example [new]
Merge branch 'master' of https://github.com/yurchik/progect1