warn: gemfile.lock
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/HotelAdvisor.iml
upd model
upd model