creating merge issue
another merge conflict
Resolving merge conflict
resolve merge
Merge branch 'tlocal'
resolve merge issue
Merge branch 'tlocal'
resolve merge
resolve merge issue
Merge branch 'tlocal'
resolve merge
edit Gemfile
added cucumber to gemfile
setting up cucumber/capybara
gems from the tutorial added
working through the tutorial, hit an error
seem to have some bugs fixed in the tutorial
fixed a feature file
Got the users tutorial done
fixing cucumber tests