Integration tests in place
Add integration_spec.rb
gem files
conflict resolved
conflict resolved
bundle udpated for gems
fixed merge conflicts from melanie
merged pull request
Merge pull request #4 from golden-bears-2014/Integration-Capybara

Integration capybara