adding some friendly hello world.
Merge remote-tracking branch 'origin/conflict-pending'

Conflicts:
	index.html

Essentially accepted the change from conflict-pending
except I changed the hello to be directed to a class