cx
Merge branch 'master' of https://github.com/Kubci/Hotel

Conflicts:
	Hotel/src/main/java/com/mycompany/hotel/SuperManagerImpl.java