initial feature testing with capybara
initial feature testing with Capybara
adding css
resolving gemfile merge conflicts
Merge branch 'user_feature_testing'