Merge branch 'master' of C:\xampp\htdocs\hotellre with conflicts.
edite 1