merged rspec
added names to editors
concluding merge