Added some text for the main landing page to say 'put something here'
Update README.md
Fixed merge conflict
Fixed some names