I don't understand this.
Merge branch 'master' of https://github.com/lohana/Hotelmania.git

Conflicts:
	Hotelmania/APDescription.txt
	Hotelmania/MTPs-Main-Container.txt
	Hotelmania/logging.log