murdge
Merge branch 'master' of https://github.com/patoui/KingWilliams

Conflicts:
	KingWilliamHotel.v11.suo
	KingWilliamHotel/Booking/AddBooking.Designer.cs
	KingWilliamHotel/bin/Debug/KingWilliamHotel.exe
	KingWilliamHotel/bin/Debug/KingWilliamHotel.mdf
	KingWilliamHotel/bin/Debug/KingWilliamHotel.pdb
	KingWilliamHotel/bin/Debug/KingWilliamHotel_log.ldf
	KingWilliamHotel/obj/Debug/DesignTimeResolveAssemblyReferences.cache
	KingWilliamHotel/obj/Debug/KingWilliamHotel.csproj.GenerateResource.Cache
	KingWilliamHotel/obj/Debug/KingWilliamHotel.exe
	KingWilliamHotel/obj/Debug/KingWilliamHotel.pdb