start rails project, add rspec & mocha
fix merge conflicts