rrr hello
merge idex-state

Conflicts:
	lib/hello.html
chahged width
changed hello
Merge branch 'master' of github.com:RomanNikitenko/hello
changed hi on hello

Conflicts:
	lib/hello.html
changed hello User

Conflicts:
	lib/hello.html
changed hi User

Conflicts:
	lib/hello.html
changed hello User

Conflicts:
	lib/hello.html
hi
init
sdfdsfdsf
tttt