verificar json
Merge branch 'master' of https://github.com/88Chains/hoteles

Conflicts:
	app/controllers/items_controller.rb