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

Conflicts:
	config/routes.rb