simplecov file for cucumber tests with /app included
Gemfile with simplecov and capybara gem
Merge branch 'tri'

Conflicts:
	features/support/env.rb