fixes
starting over on testing
scratching the surface of capybara
Merge branch 'integrating-rspec'