Merge branch '18-as-a-user-i-want-to-be-able-to-create-a-booking' into 'development'

Testing merge conflict.

Closes #18

See merge request !33

static/CSS/make_booking.css

@@ -3,6 +3,7 @@
   width: 30%;
 }
 
+
 h1 {
 color: black;
 font-family: arial, sans-serif;