initial cuke tests
benchmark taken
adding new files prior to code changes
merge gui working except for merge-with value capture
merge gui ok except for capturing merge_into
Merge branch 'working'

Conflicts:
	db/db_development
	db/db_test
	features/step_definitions/web_steps.rb
all good usinf form_to rather and button_to. This builds correct RESTful url
need params
form posting ok with param
reintroduce _merge partial
fixed web_steps
restructured feature directory
all cucumber tests passing, feature directory structure stabilised
added pending steps for merge text
last 3 steps pending on merge feature
merge post condition on 'body' failing
have basic RSpec test for merge
merge functions but no defensive edits
xferring comments - no tests
transferring comments (we hope) - no tests yet!
show errors in flash