changed hello User

Conflicts:
	lib/hello.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/hello.html