Add an author and email
moved README file
add hello world
add a line for confilict with olive
merged