clearing merge issues
merge issue
Merge branch 'master' of github.com:thebkbuffalo/travel_breakdown_app into capybara_testing
Merge branch 'master' of github.com:thebkbuffalo/travel_breakdown_app into capybara_testing
some more capybara/cucumber testing
Merge pull request #35 from thebkbuffalo/capybara_testing

Capybara testing