Add an author/email comment
Moved hello.html to lib
Fixed first conflict