Merge branch...

Merge branch '15-as-a-user-i-want-to-find-out-what-tramshed-is-so-that-i-can-access-their-working-spaces' of https://git.cardiff.ac.uk/c22064609/tramshed-tech-client-project-team-15 into 15-as-a-user-i-want-to-find-out-what-tramshed-is-so-that-i-can-access-their-working-spaces

Merge branch...
Merge branch '15-as-a-user-i-want-to-find-out-what-tramshed-is-so-that-i-can-access-their-working-spaces' of https://git.cardiff.ac.uk/c22064609/tramshed-tech-client-project-team-15 into 15-as-a-user-i-want-to-find-out-what-tramshed-is-so-that-i-can-access-their-working-spaces
2499f089 · Arianne Bayliss · 2d89fec5 · 088e8af1 · 2499f089 · 2499f089
Commit 2499f089 authored 2 years ago by Arianne Bayliss
--- a/landingpage.html
+++ b/landingpage.html
--- a/styles.css
+++ b/styles.css
--- a/static/logo.jpg
+++ b/static/logo.jpg
--- a/static/title.png
+++ b/static/title.png