add expedia gem, bundle; generate expedia controller and routes; add demo methods to #new method in expedia controller
specify JSON return for AJAX
merge conflict resolution: remove capybara-webkit, bundle
resolve Gemfile.lock conflict; i promise not to use bundle update again
Merge branch 'master' of github.com:stomatocode/GoThere into expedia
remove generated views
api call with test params works for vienna
Merge branch 'master' of github.com:stomatocode/GoThere into expedia
commit to resolve merge conflicts
fix conflict in index.html.erb
Merge branch 'master' of github.com:stomatocode/GoThere into expedia
remove US encoding from API request
change expedia controller to work with search bar form; change route from get to post for #expedia
fixing search display error
got list of json hotel objects from Expedia API working
use selenium instead of poltergeist for js driver
Merge pull request #6 from stomatocode/expedia

Expedia