basic capybara tests for text on landing page
remove ds store
fix merge conflict