got a few cucumber tests running
a few books cucumber tests work
a few books cucumber tests, and fixed conflicts