stash
Merge branch 'master' of https://github.com/88Murdoc/hoteles

Conflicts:
	config/database.yml
	db/schema.rb
Items