changed hi User

Conflicts:
	lib/hello.html