Add basic home page with some markup stepping users through the basics
Fix merge conflicts