add Version header
fix conflict in hello.html
Merge branch 'master' of github.com:hylom/git-sample

Conflicts:
	hello.html