Add hello
dsfdsfdfdf hello
Merge remote-tracking branch 'remotes/origin/master' into idex-test
Merge remote-tracking branch 'remotes/origin/style' into idex-test
rrr hello
merge idex-state

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

Conflicts:
	lib/hello.html