Thinking I might need to ignore everything in files/ until completion
Merge branch 'master' of https://github.com/richardhomewood/marina-claessens
Merge branch 'master' of https://github.com/richardhomewood/marina-claessens
Merge branch 'master' of https://github.com/richardhomewood/marina-claessens
Merge branch 'master' of https://github.com/richardhomewood/marina-claessens
Merge branch 'master' of https://github.com/richardhomewood/marina-claessens
Merge branch 'master' of https://github.com/richardhomewood/marina-claessens
Adding body class, tidying HTML markup, fixing first element margin