modified:   bookings/Seat.class
	modified:   bookings/Seat.java
	modified:   bookings/SeatReservationManager.class
	modified:   bookings/SeatReservationManager.java
Merge branch 'master' of https://github.com/cianlane/Software_Reliability_CW_1

Conflicts:
	src/bookings/Seat.java
	src/bookings/SeatReservationManager.java

	modified:   bookings/Seat.java
	modified:   bookings/SeatReservationManager.java
	modified:   bookings/Seat.java
	modified:   bookings/SeatReservationManager.class
	modified:   bookings/SeatReservationManager.java