Initial commit after local install
Installing on local dev environment
Add support for debugging
Add merge functionality
Updates to features
Update feature to check result of merge including comments
Added rspec for admin/content_controller
Complete all Cucumber scenarios for merge feature
Changed name of merge text field
Reset test db