test
test
test
Merge remote-tracking branch 'origin/test'

Conflicts:
	Program/Hotel_Manage_System.layout
	Program/base_structure.h