Merge branch 'release/1.1' into develop
adding properties to hotel.rb and parsing them
adding properties to hotel.rb and parsing them
Merge branch 'feature/improving_hotel_properties' into develop
deleting href to anchors on _inputs.html.erb
showing and hiding $('input[name="search-returning-date"]') depending on $('input[name="search-flight-type"]')
merging with origin/master
merging with origin/master
Merge branch 'feature/working_on_flights' into develop
removing Gemfile.lock
Merge branch 'hotfix/removing_secrets' into develop
switching to online
setting proxy
Merge branch 'feature/switching_online_with_proxy' into develop
capturing parameters on user's inputs when request is completed
refactoring code
Merge branch 'feature/flights' into develop
adding expedia api
adopting expedia pattern
adopting expedia pattern