a

a
Merge branch 'master' of https://github.com/lowyoujian/Test

Conflicts:
	ConsoleApplication8/ConsoleApplication8/Calculate.cs
	ConsoleApplication8/ConsoleApplication8/Option.cs
	ConsoleApplication8/ConsoleApplication8/Package.cs
	ConsoleApplication8/ConsoleApplication8/Program.cs
	ConsoleApplication8/ConsoleApplication8/Reservation.cs
	ConsoleApplication8/ConsoleApplication8/Room.cs