Merge TomBranch2.0 into master

Added error handling for the createBooking() method, so a booking cannot be added if it is already present in the bookings table, or if the desk id does not exist in the desks table - need to add what is done with these errors later