added method mapperforfacility
Merge branch 'Tomoe!'

Conflicts:
	src/domain/Booking.java
Removed file that Peter shouldn't have pushed
Updated fac to show booking details
Merge origin/master into origin_master-local
Updated fac to show booking details
Merge remote-tracking branch 'origin/TheOneAndOnlyBranchCreatedByTheGreatestHumanOfAllTime' into NewestBranchByPeterK

Conflicts:
	src/presentation/CasablancaFacilities.java
Updated fac to show booking details