Initial commit
Set up initial site with some simple design/content hard coded
Fixing merge conflicts