search available rooms
Merge branch 'master' of https://github.com/karim-omran/rails_booking_site

Conflicts:
	config/database.yml
	config/database.yml~
	config/routes.rb~
	log/development.log