started capybara testing
fixed merge conflict
made cucumber integration tests
cucumber integration tests
fixed merge error
Merge branch 'master' of https://github.com/kmazanec/adopt-a-coder into starting_capybara
Merge pull request #12 from kmazanec/starting_capybara

Starting capybara